Reenable a couple of State validations to ensure consistent state colorations.