Refactor XExpressions to Expressions