@WarnerCrocker
Probably too late, but I'd replace them with modern flash water heaters. Less bulk, less likely to leak over time, and energy/cost savings from not keeping gallons of water hot all the time.
I had one installed years ago at my house in SC, and loved it. Nobody gets a cold shower, no matter how busy the bathroom gets. Also plenty of hot water, even if the dishwasher or a load of laundry on hot is going. 🙂