Ensure --help and mix help go through the same path, closes #2142