Remove Ambiguity from Parser

[jmullercuber]

Lowish priority, but nice if it were done

[jmullercuber]

My perceived problem with ambiguity, may have been bad handling with syntax errors. Refer to most recent commit