Correcting some type annotations
Tuning up a lot of type annotations
Misc. comment/spacing fixes
Type annotation update
Cleaning up iterator interfaces
Minor fixups