Followed the non-silly suggestions of hlint on some of my sources.