Restore collection consistency

These two changes

- enable the package to be fully built again, including documentation
- fix a few minor doc glitches

I'd be grateful if they could be merged.