Add --user-pat=resort.  Minor cleanup of options.