Migrate to newly simplified parser API.