Thanks. I made a few cosmetic changes and pushed the patch as
2c50e52ab8228634ce1626dc174970f4a4321d61.