If someone chokes, they should take a sip of water.

This is actually dangerous! In the case of choking, you should allow the victim to cough. If the choking is not resolved by this, you move on to giving back blows and abdominal thrusts.