Add --user-pat=resort.  Minor cleanup of options.
Minor parser performance fix.
Fix typo.