Patches applied as 95ccd0ca005ac02125110664308fed1c0278f981 and
following with a few minor cosmetic fixes.
Thanks.