clean up some CommonMenus changes I made last week, fix a bug that would
have come from having a static member in an interface.