Editor: Menubar code clean up.