Some additional clean-up, remappings.