More changes.  Seems TECO-32 does not support macros that return values!