Postfix parser refactor