Hi Danny!

> please, when enabling features, add one feature per patch here and mention the
> feature by name per patch.

Please find the revised patch attached with this email.

> Also, please keep in mind the issues raised in '"questionable changes" commits'
> mailing list thread.

Yes, I have not removed any comments or moved the fields around. I will 
soon be not doing cosmetic changes at all, as I am working on my OCD.

Regards,
RG.