Removing dependency on command-line args (i.e. default to none).