Agree with your point on muscle memory, although I find a shell alias to be a sustainable workaround.