Refactor ExpressionUtils, improving capabilities and clarity