Small bugfixes to infix parser