Fixes a couple of minor bugs I ran into while screwing around with the menu SOC system. Also adds a macro for packing the menu hierarchy into the ID instead of the manual bitshifting nonsense from before (which would've broken everything if MENUBITS ever changed!).