Added comments, eliminated a lot of unneeded Stream s t constraints. Removed t from Parser and Result