Export disarm* with protect-out
Simplify TR class macro handling of names

Instead of using a syntax-property hack, just disarm the
expanded syntax (TR will do this later in the pipeline anyway).