Hello Danny!

> please, if possible, don't move blocks.  It complicates merging
> between our many
> git branches for no good reason and it makes review harder.

Sure, sorry about that. Please find the revised patch attached with
this email.

Regards,
RG.