Do some hlint cleanup.