Rearrange some model validations.