Fix 19916. Smarter tokenizing of contrib.comment's templatetags arguments