Simplify and shorten infix parsing, improve error reporting