This is a bad commit, sorry.

I changed my coding style just a little.  I now like having ":" and ","
on a class initializer list in front of the member attribute and such.

But this change also removes all ^M new lines.  I don't know how they got there,
but they're gone now :-)