Following hlint suggestions.