Add implicitly-defined concept maps into the concept map lookup mix, and clean up some other issues of concept map lookup