minimal work to remove 1.8 parser