Simplify add_or_increment_entry in word-count