Handle keyed options correctly in the grammar.