(forms--change-commands): Use command remapping instead of