By adding a boolean parameter, the feature can be enabled with sensible default values. Renamed the query_retry parameters and set the defaults to acceptable values. Added new parameters to diagnostic output. Also did some minor renaming.