Cleanup using hlint.