Fix issues with always remapping 'W' in command mode