Fix a few hlint suggestions.