These look good to me, assuming they've passed "make check". Could use test cases for the hackery we're trying to prevent, but that shouldn't stop the patches from going in. After you have consensus, will you need someone to check these in for you?