Fixed up manual arg fixup to be a bit more user friendly.. we don't want...

... to keep hacking to be TOO elite