[COMMIT] Handle interactive command remapping a little better than 7371081ce8f7, keymap.c