Work on #332.  Add support for mappings in ContentAssistMode.