Fix wacko key translation issues with next-error and narrow-dwim