Improved infix parsing