I don't like the new docstring but I don't care enough right now to
find something better.  Suggestions very much welcome!