Stop jumping through hoops to get at the collector object
Remove now unnecessary branching from bottle DSL methods
Extract tag and checksum selection from DSL method
Remove unused parameter