New parser; proper handling of ENPTVD/ENKRVD.