Also cleaned up how some of the operators work.  They weren't playing nice
with undo.