Work on generator optimization & switch parsing.