Yes, it is simplified some if you have an FLXM 13 tool from Snap On. It has a 1/4" shaft and flex socket that will get to the water pump bolts without field stripping the entire front end of the engine.

Also, the heater pipe that goes horizontally across the engine can be slid toward the passenger side out of the way, by simply loosening the Allen bolt that goes vertically into the head and sliding it. The bolt goes through a slot and is difficult to get all the way out, but you don't need to. It is not totally obvious that this is a slot, so the first time, you remove it all the way before you discover that you don't have to.

Hope this helps,