Patch attached, see comments in it for more info.
Usage message/--help/-h fixes
Thanks - applied in git tree.
This Tracker item was closed automatically by the system. It was
previously set to a Pending status, and the original submitter
did not respond within 14 days (the time period specified by
the administrator of this Tracker).