After a closer search this last weekend I have a new theory on Water Music. I believe that the Jerry A. route, "Are You A Virgin" is probably the retro-bolted version of Water Music. There are two old bolts as reported by Higgins still in the current version, one at the start and one chopped stud below Jerry's anchor, possibly the original one-bolt anchor. It is 5.8, left of the old dead tree, and Jerry specifically said he thinks his line is "an old Higgins "solo"", or in other words, underbolted by his own standards. The name suggests he has the same suspicion too.
Also, there is an uncharacteristic runout to the anchor where I am pretty sure Jerry probably found a bolt, replaced it and ceased bolting for the rest of the way. This last bolt is pretty much the crux of the pitch and the best point to protect if there were one. The rest of the route to the summit could have been easily done without bolting.
Any thoughts would be appreciated.