Assorted documentation/consistency updates

No breaking changes.