Blarg, many little parser fixes and accompanying AST modifications.