Added more tree walker rules and string templates.
Modified test example to use an expression.