These changes are in Don's next pull request. I pulled it in because while debugging some test failures, I noticed the same problem that Don had (the test with is_checked was actually testing something bogus).