Well, he is 21 lbs now, and getting taller (and bigger) every day so he didn't need the shallow puppy bowls anymore. I bought some heavy non-tip non-skid plastic bowls with a stainless liner, then I got a tool drawer non-skid liner to put underneath the bowls to make it so they move even less, and the whole contraption sits in a boot mat so that if he does spill some water it is somewhat contained by the lip of the mat.
It's really strange. I used to get sent to secondary security all of the time before 9/11. Now, I never get sent. I'm not sure what changed. It seemed to be that it was always my turn when it was the random guy to get pulled.