Attempt to deal with redirected entries.

Currently only works if the redirected entry exists in the current keymap. Need
to fix redirects after merging.