v2. add body: / drop double indexing of headers

[David Bremner]

It turns out the that the database schema comments Matt referred to
are pretty out of date, so the first 3 commits here are cleanup for
that commentary, and could go in independently.