Add spaces after commas.
Fix weird line break comments in doctest.

I don't see any benefit to ensuring the comments here are on the same
line as the code. 2to3 gets confused by these lines, and in the HTML
results, the comments are cut off because the lines are so long, so it
seems unnecessary.