Standardize rmenu_generic code more