I tend to over-tip (thanks Dad)... But when I see a gratuity added (unless I feel like I am being discriminated against) I usually add a few extra bucks. You can easily make someone happy with just a little bit that shows you noticed. On a $100 bill with a 18% included gratuity you can take that tip to 20% for only $2.00. I don't even notice its gone and someone else is most likely very appreciative.

That being said, please give me the name and contact information of the waiter from the OP's complaint. Once I am made Dictator for Life of this Country, we will have him disposed of.