delete commented-out unused code
update some method names from parse() to parseExpr()
move ExprParser.mapTokens() to new class TokenListMapper