More work on validators.