I'll give that a try when I get a chance. (This is at my mother's house, and she said she didn't really care, so long as the leak was dealt with.)
I'm still trying to figure out why water all of a sudden started gushing out well after I had everything disconnected. Turns out it was the cold side, not from the water heater. I opened up other faucets and an outside hose bibb, but it took several minutes to stop. There's another faucet that needs to be fixed as well, and I'd like to avoid that problem whenever I get around to it.