Additional work on the parser before I begin draft 2.0.