BatchSize is now in MB, not KB.
Timeouts now have a type name that will be logged; code cleanup.