Revamp pragma parsing and reinstate NAME in Parser2.