T S1: removed some unused local macros, and expanded others that were used once
T S1: simplified variable character placement
T S1: dropped the now-useless catch-all undo event
T S1: fixed an on -> in screwup of mine