Fixing failing doctests related to 75f1cd05d8b792.