- fix some doctest failures (though some remain, as it's not easy to get doctest
to accept things flexibly), fix #2999