"He was still drinking 2L...(his entire fluid intake)"
Isn't that low? I drink at least a gallon a day, and more during summer.
I learned the hard way via kidney stone that low fluid intake is bad. After further analysis of the stone's makeup, my doctor's prescription for avoiding future stones was stay hydrated. I have followed that advice ever since.