Further fleshing out of the parser.