Continued work on mash parser.