Replaced the NEXT parser with a new, better, recursive-decent one.