We need to make sure that these changes are propagated to master, where I've got a paralell PR to add Parser70 class.