Refactor hashmaps out of the ContactEmailAddress and ContactPhoneNumber query executors.