Overhaul of bodies and bundles documentation, removing duplication and
inconsistent language.

Merge datatypes with variables.