Better handling of input arguments.