I had to move one hunk (.dec change) from 2/3 to 1/3 in order to not break bisect. If you're happy with the slightly modified version, I think this is good to go in. Please let me know.