Water heaters other than continuous-flow or water storage heaters