Remove decorator pattern from validator; we'll only have one decorator which invokes...