Improve the parsing rules, avoiding eating all possible chars.

Help improving the situation for #56.