demote winner/combine to term

Author: TimToady

STD.pm6

@@ -1572,11 +1572,11 @@ grammar P6 is STD {
     }
     rule statement_control:default { <sym> <block> }
 
-    rule statement_control:winner  { <sym> <xblock> }
-    rule statement_control:combine { <sym> <xblock> }
+    rule term:winner               { <sym> <xblock> }
+    rule term:combine              { <sym> <xblock> }
     rule statement_control:more    { <sym> <xblock> }
     rule statement_control:done    { <sym> <xblock> }
-    rule statement_control:later   { <sym> <block> }
+    rule statement_control:wait    { <sym> <xblock> }
 
     token statement_prefix:BEGIN   { :my %*MYSTERY; <sym> <blast> <.explain_mystery> }
     token statement_prefix:CHECK   { <sym> <blast> }