Refactor of fix for Ticket 22232

This is a refactor of NathanRSmith's fix for ticket #22232
I find that warping at 80 chars works well for docstrings.