ExpressionHelper refactoring.
Working on #225.
Fixed #225.
Fixed test.