Cleaned up InfixInterpreter