I really, really don't like the mapping but trying to honor the "don't touch other people's work" mantra unless it's causing validation/duplicate tagging issues but I went ahead and tried to do minimally invasive changes to this area.  Please reopen if there are still issues.