Minor changes to parser to make it less logical but a little firmer. (E.g. ints can't be backtracked into becoming symbols!)