Clean up the fixes from last night.

All should be well with the editor's tree now.