Twiddle a few doctests to work in this branch--small floating point differences likely due to slight implementation differences between the two versions.  Now all tests are passing except some of those introduced by #1949.  Still trying to understand the root of that problem.