Further work towards making menu_selectors strict.