Add Attachment:STR-676: rtg: replace special non-terminals <string> and <int> with special terminals <string> and <int>.