Revert 2010-07-14 change to deactivate mark; minor cleanups.