I have had this discussion many times and it has been pointed out, the code does not specifically require a bond around the water heater or any other non-conductive fixture.
You can get there with the word "systems" by saying all of the pipe in the system needs to be bonded using the jumpers defined in 250.104 but you still have guys arguing the other side.
