Improve efficiency of class addition.  Fix move element optimizing glitch.