Also fixes a failure when running doctests via Sphinx.