Agreed @sipa, it's not part of the block verification/consensus so should likely be somewhere else.
(then again, this pull is not the place to fix that)