20% for anything.
And while I agree that tipping is for service, I only expect average service for my 20% rule to kick in. I think too many people find excuses* to not tip appropriately. Not you, Previous Poeter, just people in general.
*"I had to ask for a water refill," or, "It took too long for her to take our order," etc.