(Menu) menu_parse_and_resolve cleanups