Reorder methods, add dummy bodies to BSON encoder methods.
Cleanup and renaming.