Fixing up the optional input arguments.