More refactoring to DOM expression evaluator