Out of curiosity, I ran the test suite on a version of upstream/master (i.e. with these biggus changes) which I tweaked to remove the count/unmask logic and it ran noticeably *faster*.