Agreed. I don't think either that we need to update this comment. I was playing with this patch and what you have here looks fine by me. Two nits: the extra parenthesis in the assert are not necessary, and the indentation had some diffs. Tom has just reindented the whole tree, so let's keep things clean.
