An ounce of water spot prevention is worth a pound of polishing compound.