Add new switch grammar which will eventually replace multi_def.