These are a few patches to improve help, option handling, and prepare for extending the search types. These do not change the existing (external) behavior or defaults beyond adding additional options. The patches are fairly independent, but may not apply cleanly out of order.