Argh, I didn't commit the final implementation. Just pushed a fix.