Make --user-pat=trust default.  Fix a few warnings found by Morgan.  Minor changes to options.