Add in all of the other unambiguous mappings.