fix up expand-one-phrase-map