Removed more eager validation.