What it comes down to is that "less" applies to continuous quantities, where "fewer" applies to discrete quantities. So you have less water but fewer glasses. "More" applies to both, just because English is such a wonderfully rich and evocative language (which is more agreeable than saying it is an inconsistent mongrel of a language).