Get rid of expand: expr
Direct call to generate verbatim
Get rid from source(): expressions
Remove generateExpression