Fix up validation scheme to be transactional.