I'm not sure whether this meets the threshold for what I might merge without review; it does seem a little larger than is intended by "editorial fixes" on our merge policy.
Some of the per-file documentation I added here could stand to be more verbose. If it's okay with the reviewer, I'd like to have a separate tickets about that. Without this minimal per-file documentation, all of the member documentation in each file remains ignored by Doxygen.
Trac: Status: assigned to needs_review Actualpoints: N/Ato .1