Add Attachment:STR-149: Remove built-in tuple nonterm and replace by built-in terminals 1, 2, etc.