Last bit of cleanup from the editor bug fixes.