Fix a few more things for persistent undo.
6 files changed