Fix issue 496.
Prevent skip of TExpr defined by a macro.
Formatting.