Replace old validator with parser-based one (which was actually used by
the old validator, after it was rewritten)