hlint-inspired cleanups.