Improved doctests under Python 2.7.