I had a series in progress more or less at the same time as Jani, so of course there were all kinds of silly conflicts. I rebased the two series together, and tried to get most of Tomi's formatting comments.