this is a relatively small ancillary change and doesn't muddle up the diff too much, so I'm not that worried about keeping it in a separate diff, but you need to add a comment here explaining /why/ hooks are applied at this point and not the later point.