Merge

Quash compiler warnings.

and fixed them all. Mostly this meant replacing unused variables
with underscores, fixing names which shadowed other names, and
adding type annotation.