bson: some cleanup.