Moving Conrad's recent parser work out to a branch. Reverted r62434, r62416, r62150...