(Apple/iOS) Cleanups of menu.m