They want to see a disconnect around here and that is usually where the electrician stops, although he still "owns" the wire going to the water heater if there is a violation. I see them run in everything from just Romex to FMC, MC or SealTite.
I haven't seen metal water pipe in so long I tend to forget about bonding


Greg Fretwell