JavascriptExpressionGenerator refactor