In extremis - I remember reading a tip from a lady who title herself 'The Head Mistress', and is an authority on heads. For really dirty holding tanks, she suggested putting non-foaming detergent into the tank, and then a bag of ice, then go sailing. The ice bangs around, rather like an internal scrubbing brush, loosening any deposits, with the help of the detergent. And when all is done, the resulting liquid can simply be pumped out. I wonder if that approach would also work for water tanks? There are no baffles...