I can't agree with either point. Any knowledge of calculus can help you detect situations where politicians or other people with an agenda (even your boss) are trying to pull the wool over your eyes with something that would otherwise sound plausible. Min/max would be an example, and not only for maximizing profit.
CS, OTOH, I don't regard as useful to the general population, which I can't imagine ever having to, for example, select the most appropriate sort algorithm. Computer *usage* skills are necessary, and by that I don't mean simply teaching the latest Microsoft products. Or if that's deemed the most practical means of preparing students for the "real" world, then also teach, for example, how Excel's stat functions can lead you astray.