...And, cleaned up some other editor-related stuff that I wanted to 
clean up.