Some reworked patches

[Dirk Hohndel]

On Wed, May 21, 2014 at 01:12:36PM -0300, Tomaz Canabrava wrote:
> Dirk,
> 
> I'v tried to make the whitespace noise near to zero, if anything is
> not what it should be, just scream and I'll fix.

The last series was perfect - I just did a couple minimal edits to the
commit messages. Of course the fact that it was mostly code removal and
copying of code sure helped :-)

/D