Second pass on the docstring rewrite