Validator no longer uses EventEmitter
Fixed up to make validation cleaner