Removed more hair in support of future-generator stmts.