Move key remap instruction into separate step.