[[ Bug 13796 ]] Separate setting the script from the commandline, from e...

...lsewhere.