I tip 20% on everything, including the tax. It's really not all that much, now is it?
However, I NEVER tip on top of the "included" tip amount - that's just a personal policy. And I'm very careful about reading the bill - I used to be a waiter too.
I hold those who make arguments for skimping on tipping in very low regard. Very low regard.