Add parsing for '%s' and '%c' + comments