Some cleanup to the catomongo module.