The change looks good to me, thanks! I made a minor change to your
patch (i.e. .keys() not needed in sorted()), did some whitespace
normalization, and fixed up the --dump output. Otherwise, the patch is
quentin's and I've committed it to the tree.
r59581