#5687: Prep for change in menu paths.