Quick fix #5; more doctests