modified:   parser.py
Committing before a (potential) major rewrite of the parsing code
	modified:   mangle.py
	modified:   parser.py
Whew, almost done! One final push!