Fix up some hlint and ghc-mod warnings