We should just put non-dairy on all beverages that are non-dairy. Non-dairy Mountain Dew. Non-dairy sweetened lemon beverage. Non-dairy gin. Non-dairy water.
Should probably also mark gluten and lead while you're at it, among other things. Also what about radioactive isotope content? We know how important that is thanks to Intel.