Doctest fixes, mostly due to section-level granularity