A little bit of refactoring in the ExpressionProcessor class.