Some Haddock cleanup.
But I notice our documentation is fairly inconsitent and ad-hoc; we should decide on something more systematic.