Replaced the water pump today. No big deal as jr's3800 said. He was right about the bolts having 10mm and 13mm heads. The last bolt in the water pump that needs to have the power steering pump moved to be taken out is a 13mm however, not 10mm. I'm certainly not going to fault him on that though, he was right on everything else, probably working from memory.
For everyone else'* info, the 2 bolts holding the power steering pump on can be accessed through holes in the power steering pump pulley. The bolts are in about the 12 o'clock and 7 o'clock positions. Just undo those 2 bolts, no need to take them out of the pump body, move the pump out of the way just enough to remove that one bolt in the water pump, and the water pump can be removed once all the bolts are out.
Thanks again for the help.