I know of a case where apparently increasing water intake solved the problem.
That too. My Daughter makes the kind that have spikes like a Goat head thorn. She can’t pass them at all until the citric acid melts off the spikes first. I think this type may be fairly common and why sometime it is very hard to pass them.