More progress converting those damn doctests.