Fixing some command parsing issues caused from switching to built-in parsec tokens.
Merge branch 'razor' of https://github.com/salmans/Razor