Here is a trick I always seem to forget.

Put the new water pump off to the side, pull the old bolts out and put them in the new pump in the place they came out of the old pump. This will save you about 40 curse words and 25 mins.