Refactors ExpressionBuilder.