Fix some doc/doctest issues.  Or at least try to.