Refactor to facilitate future support of RPN parsing