Apply hlint suggestions

There are still some warnings from GHC itself about shadowing, but I don't know how you'd like to handle these?