Fancy parser changes.  Recursive generators, oh my!