(iOS) menu.m - more cleanups/build fixes