Add in a “per container” for things that are realistically seen as a single serving, like your drink example.

That way I don’t have to do the ‘per 100g’ figuring and I have a realistic assessment of that small can of soup that’s somehow supposed to be 2 to 3 servings.