This removes ambiguity from some commands This simplifies parsing in some cases (see #10972).
I have excluded the change from some parts to not break compatibility. This will still probably break a lot of scripts.