Avoid trailing space in to-expression-string.
Make include test verify that defaults are added in expressions.