Fix latest parsing breakage