Cleanups in menu_common.c