Perhaps I'm being pedantic, but I'd prefer the new validation to be added in a separate commit from the reshuffling. Ditto for other new code this commit that I might not have seen.