Solved existing one-to-one mappings not found by search.

Those that require many-to-many handling are still left unsolved.
Manual fixup tool used to generate ef9892ccb.