DIP69: parsing changes