Fix unimpaired-style mappings