Updated the nonterminal code to reflect the design outlined in the 6G60.i7x comments, in particular by adding a subsentence kind for nonterminals.