SS Water tanks are under the 2 main cabin settees. I don't look forward having to tear apart the beautiful woodwork if/when it comes to that, though I suppose I could do most of the aesthetic damage under the cushions where it's not visible.

To remove the fuel tank I'd have to remove the engine; another 'hope it doesn't come to that' but again not the end of the world.