Woohoo! 
Thank you very much on the review process. I love how the code got a lot better and smaller as we went long, plus noticing the bitmask option that I missed. Keeping the patch in a clean cherry-picked state, the Gerrit review process: it really helps with calmly thinking through things, much better than the GitHub et al PR processes I have experienced.
I hope to have less churn and formatting issues on the next patch. 