Cleaning up hlint suggestions.