I see there is "Gas Instantaneous Water Heaters" in Table 7.8, but there is not an "Electric Instantaneous Water Heater" in the table.  Is the "Electric Water Heaters" term meant to be generic and apply to both electric storage and instantaneous water heaters?