I'm sure now is the right time for me to point out that one of your commits is finally underdocumented because this bit is not explained ;-)