Exactly!  I'll remove this macro and use that.  The excapeUnderscores macro I still need.