Format
Resolve warnings from hlint

Resolve all the warnings from hlint, excepting the few which we
ignore.