diff --git a/internal/self/self.go b/internal/self/self.go
index ab72687..6b07a9e 100644
--- a/internal/self/self.go
+++ b/internal/self/self.go
@@ -821,624 +821,550 @@ func parseInput(r io.Reader, p parser, b builder, kw []parser) (*Node, error) {
 
 func Parse(r io.Reader) (*Node, error) {
 
-	var p196 = sequenceParser{id: 196, commit: 128, ranges: [][]int{{0, -1}, {1, 1}, {0, -1}}}
-	var p194 = choiceParser{id: 194, commit: 2}
-	var p193 = choiceParser{id: 193, commit: 262, name: "wsc", generalizations: []int{194}}
-	var p15 = choiceParser{id: 15, commit: 258, name: "wschar", generalizations: []int{193, 194}}
-	var p2 = sequenceParser{id: 2, commit: 10, allChars: true, ranges: [][]int{{1, 1}, {1, 1}}, generalizations: []int{15, 193, 194}}
-	var p1 = charParser{id: 1, chars: []rune{32}}
+	var p172 = sequenceParser{id: 172, commit: 128, ranges: [][]int{{0, -1}, {1, 1}, {0, -1}}}
+	var p170 = choiceParser{id: 170, commit: 2}
+	var p169 = choiceParser{id: 169, commit: 262, name: "wsc", generalizations: []int{170}}
+	var p2 = sequenceParser{id: 2, commit: 258, name: "wschar", allChars: true, ranges: [][]int{{1, 1}}, generalizations: []int{169, 170}}
+	var p1 = charParser{id: 1, chars: []rune{32, 9, 10, 8, 12, 13, 11}}
 	p2.items = []parser{&p1}
-	var p4 = sequenceParser{id: 4, commit: 10, allChars: true, ranges: [][]int{{1, 1}, {1, 1}}, generalizations: []int{15, 193, 194}}
-	var p3 = charParser{id: 3, chars: []rune{9}}
-	p4.items = []parser{&p3}
-	var p6 = sequenceParser{id: 6, commit: 10, allChars: true, ranges: [][]int{{1, 1}, {1, 1}}, generalizations: []int{15, 193, 194}}
-	var p5 = charParser{id: 5, chars: []rune{10}}
-	p6.items = []parser{&p5}
-	var p8 = sequenceParser{id: 8, commit: 10, allChars: true, ranges: [][]int{{1, 1}, {1, 1}}, generalizations: []int{15, 193, 194}}
-	var p7 = charParser{id: 7, chars: []rune{8}}
-	p8.items = []parser{&p7}
-	var p10 = sequenceParser{id: 10, commit: 10, allChars: true, ranges: [][]int{{1, 1}, {1, 1}}, generalizations: []int{15, 193, 194}}
-	var p9 = charParser{id: 9, chars: []rune{12}}
-	p10.items = []parser{&p9}
-	var p12 = sequenceParser{id: 12, commit: 10, allChars: true, ranges: [][]int{{1, 1}, {1, 1}}, generalizations: []int{15, 193, 194}}
-	var p11 = charParser{id: 11, chars: []rune{13}}
-	p12.items = []parser{&p11}
-	var p14 = sequenceParser{id: 14, commit: 10, allChars: true, ranges: [][]int{{1, 1}, {1, 1}}, generalizations: []int{15, 193, 194}}
-	var p13 = charParser{id: 13, chars: []rune{11}}
+	var p30 = sequenceParser{id: 30, commit: 264, name: "comment", ranges: [][]int{{1, 1}, {0, -1}, {1, 1}, {0, -1}}, generalizations: []int{169, 170}}
+	var p26 = choiceParser{id: 26, commit: 266, name: "comment-segment"}
+	var p25 = sequenceParser{id: 25, commit: 266, name: "line-comment", ranges: [][]int{{1, 1}, {0, -1}, {1, 1}, {0, -1}}, generalizations: []int{26}}
+	var p22 = sequenceParser{id: 22, commit: 10, allChars: true, ranges: [][]int{{1, 1}, {1, 1}, {1, 1}, {1, 1}}}
+	var p20 = charParser{id: 20, chars: []rune{47}}
+	var p21 = charParser{id: 21, chars: []rune{47}}
+	p22.items = []parser{&p20, &p21}
+	var p24 = sequenceParser{id: 24, commit: 10, allChars: true, ranges: [][]int{{1, 1}, {1, 1}}}
+	var p23 = charParser{id: 23, not: true, chars: []rune{10}}
+	p24.items = []parser{&p23}
+	p25.items = []parser{&p22, &p24}
+	var p19 = sequenceParser{id: 19, commit: 266, name: "block-comment", ranges: [][]int{{1, 1}, {0, -1}, {1, 1}, {1, 1}, {0, -1}, {1, 1}}, generalizations: []int{26}}
+	var p7 = sequenceParser{id: 7, commit: 10, allChars: true, ranges: [][]int{{1, 1}, {1, 1}, {1, 1}, {1, 1}}}
+	var p5 = charParser{id: 5, chars: []rune{47}}
+	var p6 = charParser{id: 6, chars: []rune{42}}
+	p7.items = []parser{&p5, &p6}
+	var p15 = choiceParser{id: 15, commit: 10}
+	var p12 = sequenceParser{id: 12, commit: 10, ranges: [][]int{{1, 1}, {1, 1}, {1, 1}, {1, 1}}, generalizations: []int{15}}
+	var p9 = sequenceParser{id: 9, commit: 10, allChars: true, ranges: [][]int{{1, 1}, {1, 1}}}
+	var p8 = charParser{id: 8, chars: []rune{42}}
+	p9.items = []parser{&p8}
+	var p11 = sequenceParser{id: 11, commit: 10, allChars: true, ranges: [][]int{{1, 1}, {1, 1}}}
+	var p10 = charParser{id: 10, not: true, chars: []rune{47}}
+	p11.items = []parser{&p10}
+	p12.items = []parser{&p9, &p11}
+	var p14 = sequenceParser{id: 14, commit: 10, allChars: true, ranges: [][]int{{1, 1}, {1, 1}}, generalizations: []int{15}}
+	var p13 = charParser{id: 13, not: true, chars: []rune{42}}
 	p14.items = []parser{&p13}
-	p15.options = []parser{&p2, &p4, &p6, &p8, &p10, &p12, &p14}
-	var p54 = sequenceParser{id: 54, commit: 264, name: "comment", ranges: [][]int{{1, 1}, {0, -1}, {1, 1}, {0, -1}}, generalizations: []int{193, 194}}
-	var p50 = choiceParser{id: 50, commit: 266, name: "comment-segment"}
-	var p49 = sequenceParser{id: 49, commit: 266, name: "line-comment", ranges: [][]int{{1, 1}, {0, -1}, {1, 1}, {0, -1}}, generalizations: []int{50}}
-	var p46 = sequenceParser{id: 46, commit: 10, allChars: true, ranges: [][]int{{1, 1}, {1, 1}, {1, 1}, {1, 1}}}
-	var p44 = charParser{id: 44, chars: []rune{47}}
-	var p45 = charParser{id: 45, chars: []rune{47}}
-	p46.items = []parser{&p44, &p45}
-	var p48 = sequenceParser{id: 48, commit: 10, allChars: true, ranges: [][]int{{1, 1}, {1, 1}}}
-	var p47 = charParser{id: 47, not: true, chars: []rune{10}}
-	p48.items = []parser{&p47}
-	p49.items = []parser{&p46, &p48}
-	var p43 = sequenceParser{id: 43, commit: 266, name: "block-comment", ranges: [][]int{{1, 1}, {0, -1}, {1, 1}, {1, 1}, {0, -1}, {1, 1}}, generalizations: []int{50}}
-	var p31 = sequenceParser{id: 31, commit: 10, allChars: true, ranges: [][]int{{1, 1}, {1, 1}, {1, 1}, {1, 1}}}
-	var p29 = charParser{id: 29, chars: []rune{47}}
-	var p30 = charParser{id: 30, chars: []rune{42}}
-	p31.items = []parser{&p29, &p30}
-	var p39 = choiceParser{id: 39, commit: 10}
-	var p36 = sequenceParser{id: 36, commit: 10, ranges: [][]int{{1, 1}, {1, 1}, {1, 1}, {1, 1}}, generalizations: []int{39}}
-	var p33 = sequenceParser{id: 33, commit: 10, allChars: true, ranges: [][]int{{1, 1}, {1, 1}}}
-	var p32 = charParser{id: 32, chars: []rune{42}}
-	p33.items = []parser{&p32}
-	var p35 = sequenceParser{id: 35, commit: 10, allChars: true, ranges: [][]int{{1, 1}, {1, 1}}}
-	var p34 = charParser{id: 34, not: true, chars: []rune{47}}
-	p35.items = []parser{&p34}
-	p36.items = []parser{&p33, &p35}
-	var p38 = sequenceParser{id: 38, commit: 10, allChars: true, ranges: [][]int{{1, 1}, {1, 1}}, generalizations: []int{39}}
-	var p37 = charParser{id: 37, not: true, chars: []rune{42}}
-	p38.items = []parser{&p37}
-	p39.options = []parser{&p36, &p38}
-	var p42 = sequenceParser{id: 42, commit: 10, allChars: true, ranges: [][]int{{1, 1}, {1, 1}, {1, 1}, {1, 1}}}
-	var p40 = charParser{id: 40, chars: []rune{42}}
-	var p41 = charParser{id: 41, chars: []rune{47}}
-	p42.items = []parser{&p40, &p41}
-	p43.items = []parser{&p31, &p39, &p42}
-	p50.options = []parser{&p49, &p43}
-	var p53 = sequenceParser{id: 53, commit: 10, ranges: [][]int{{0, -1}, {0, 1}, {0, -1}, {1, 1}, {0, -1}, {0, 1}, {0, -1}, {1, 1}}}
-	var p28 = choiceParser{id: 28, commit: 266, name: "ws-no-nl"}
-	var p17 = sequenceParser{id: 17, commit: 10, allChars: true, ranges: [][]int{{1, 1}, {1, 1}}, generalizations: []int{28}}
-	var p16 = charParser{id: 16, chars: []rune{32}}
-	p17.items = []parser{&p16}
-	var p19 = sequenceParser{id: 19, commit: 10, allChars: true, ranges: [][]int{{1, 1}, {1, 1}}, generalizations: []int{28}}
-	var p18 = charParser{id: 18, chars: []rune{9}}
-	p19.items = []parser{&p18}
-	var p21 = sequenceParser{id: 21, commit: 10, allChars: true, ranges: [][]int{{1, 1}, {1, 1}}, generalizations: []int{28}}
-	var p20 = charParser{id: 20, chars: []rune{8}}
-	p21.items = []parser{&p20}
-	var p23 = sequenceParser{id: 23, commit: 10, allChars: true, ranges: [][]int{{1, 1}, {1, 1}}, generalizations: []int{28}}
-	var p22 = charParser{id: 22, chars: []rune{12}}
-	p23.items = []parser{&p22}
-	var p25 = sequenceParser{id: 25, commit: 10, allChars: true, ranges: [][]int{{1, 1}, {1, 1}}, generalizations: []int{28}}
-	var p24 = charParser{id: 24, chars: []rune{13}}
-	p25.items = []parser{&p24}
-	var p27 = sequenceParser{id: 27, commit: 10, allChars: true, ranges: [][]int{{1, 1}, {1, 1}}, generalizations: []int{28}}
-	var p26 = charParser{id: 26, chars: []rune{11}}
-	p27.items = []parser{&p26}
-	p28.options = []parser{&p17, &p19, &p21, &p23, &p25, &p27}
-	var p52 = sequenceParser{id: 52, commit: 10, allChars: true, ranges: [][]int{{1, 1}, {1, 1}}}
-	var p51 = charParser{id: 51, chars: []rune{10}}
-	p52.items = []parser{&p51}
-	p53.items = []parser{&p28, &p52, &p28, &p50}
-	p54.items = []parser{&p50, &p53}
-	p193.options = []parser{&p15, &p54}
-	p194.options = []parser{&p193}
-	var p195 = sequenceParser{id: 195, commit: 258, name: "syntax:wsroot", ranges: [][]int{{0, 1}, {0, -1}, {0, 1}, {0, 1}}}
-	var p190 = sequenceParser{id: 190, commit: 2, ranges: [][]int{{1, 1}, {0, -1}}}
-	var p186 = sequenceParser{id: 186, commit: 10, allChars: true, ranges: [][]int{{1, 1}, {1, 1}}}
-	var p185 = charParser{id: 185, chars: []rune{59}}
-	p186.items = []parser{&p185}
-	var p189 = sequenceParser{id: 189, commit: 2, ranges: [][]int{{0, -1}, {1, 1}}}
-	p189.items = []parser{&p194, &p186}
-	p190.items = []parser{&p186, &p189}
-	var p184 = sequenceParser{id: 184, commit: 258, name: "definitions", ranges: [][]int{{1, 1}, {0, 1}}}
-	var p177 = sequenceParser{id: 177, commit: 256, name: "definition", ranges: [][]int{{1, 1}, {0, -1}, {1, 1}, {0, -1}, {1, 1}}}
-	var p174 = sequenceParser{id: 174, commit: 266, name: "definition-name", ranges: [][]int{{1, 1}, {0, -1}, {1, 1}, {0, -1}}}
-	var p92 = sequenceParser{id: 92, commit: 264, name: "symbol", ranges: [][]int{{1, -1}, {1, -1}}, generalizations: []int{98, 124, 128}}
-	var p91 = sequenceParser{id: 91, commit: 10, allChars: true, ranges: [][]int{{1, 1}, {1, 1}}}
-	var p90 = charParser{id: 90, not: true, chars: []rune{92, 32, 10, 9, 8, 12, 13, 11, 47, 46, 91, 93, 34, 123, 125, 94, 43, 42, 63, 124, 40, 41, 58, 61, 59}}
-	p91.items = []parser{&p90}
-	p92.items = []parser{&p91}
-	var p173 = sequenceParser{id: 173, commit: 10, ranges: [][]int{{1, 1}, {1, 1}, {1, 1}, {1, 1}}}
-	var p172 = sequenceParser{id: 172, commit: 10, allChars: true, ranges: [][]int{{1, 1}, {1, 1}}}
-	var p171 = charParser{id: 171, chars: []rune{58}}
-	p172.items = []parser{&p171}
-	var p170 = choiceParser{id: 170, commit: 258, name: "flag"}
-	var p139 = sequenceParser{id: 139, commit: 264, name: "alias", allChars: true, ranges: [][]int{{1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}}, generalizations: []int{170}}
-	var p134 = charParser{id: 134, chars: []rune{97}}
+	p15.options = []parser{&p12, &p14}
+	var p18 = sequenceParser{id: 18, commit: 10, allChars: true, ranges: [][]int{{1, 1}, {1, 1}, {1, 1}, {1, 1}}}
+	var p16 = charParser{id: 16, chars: []rune{42}}
+	var p17 = charParser{id: 17, chars: []rune{47}}
+	p18.items = []parser{&p16, &p17}
+	p19.items = []parser{&p7, &p15, &p18}
+	p26.options = []parser{&p25, &p19}
+	var p29 = sequenceParser{id: 29, commit: 10, ranges: [][]int{{0, -1}, {0, 1}, {0, -1}, {1, 1}, {0, -1}, {0, 1}, {0, -1}, {1, 1}}}
+	var p4 = sequenceParser{id: 4, commit: 266, name: "ws-no-nl", allChars: true, ranges: [][]int{{1, 1}, {1, 1}}}
+	var p3 = charParser{id: 3, chars: []rune{32, 9, 8, 12, 13, 11}}
+	p4.items = []parser{&p3}
+	var p28 = sequenceParser{id: 28, commit: 10, allChars: true, ranges: [][]int{{1, 1}, {1, 1}}}
+	var p27 = charParser{id: 27, chars: []rune{10}}
+	p28.items = []parser{&p27}
+	p29.items = []parser{&p4, &p28, &p4, &p26}
+	p30.items = []parser{&p26, &p29}
+	p169.options = []parser{&p2, &p30}
+	p170.options = []parser{&p169}
+	var p171 = sequenceParser{id: 171, commit: 258, name: "syntax:wsroot", ranges: [][]int{{0, 1}, {0, -1}, {0, 1}, {0, 1}}}
+	var p166 = sequenceParser{id: 166, commit: 2, ranges: [][]int{{1, 1}, {0, -1}}}
+	var p162 = sequenceParser{id: 162, commit: 10, allChars: true, ranges: [][]int{{1, 1}, {1, 1}}}
+	var p161 = charParser{id: 161, chars: []rune{59}}
+	p162.items = []parser{&p161}
+	var p165 = sequenceParser{id: 165, commit: 2, ranges: [][]int{{0, -1}, {1, 1}}}
+	p165.items = []parser{&p170, &p162}
+	p166.items = []parser{&p162, &p165}
+	var p160 = sequenceParser{id: 160, commit: 258, name: "definitions", ranges: [][]int{{1, 1}, {0, 1}}}
+	var p153 = sequenceParser{id: 153, commit: 256, name: "definition", ranges: [][]int{{1, 1}, {0, -1}, {1, 1}, {0, -1}, {1, 1}}}
+	var p150 = sequenceParser{id: 150, commit: 266, name: "definition-name", ranges: [][]int{{1, 1}, {0, -1}, {1, 1}, {0, -1}}}
+	var p68 = sequenceParser{id: 68, commit: 264, name: "symbol", ranges: [][]int{{1, -1}, {1, -1}}, generalizations: []int{74, 100, 104}}
+	var p67 = sequenceParser{id: 67, commit: 10, allChars: true, ranges: [][]int{{1, 1}, {1, 1}}}
+	var p66 = charParser{id: 66, not: true, chars: []rune{92, 32, 10, 9, 8, 12, 13, 11, 47, 46, 91, 93, 34, 123, 125, 94, 43, 42, 63, 124, 40, 41, 58, 61, 59}}
+	p67.items = []parser{&p66}
+	p68.items = []parser{&p67}
+	var p149 = sequenceParser{id: 149, commit: 10, ranges: [][]int{{1, 1}, {1, 1}, {1, 1}, {1, 1}}}
+	var p148 = sequenceParser{id: 148, commit: 10, allChars: true, ranges: [][]int{{1, 1}, {1, 1}}}
+	var p147 = charParser{id: 147, chars: []rune{58}}
+	p148.items = []parser{&p147}
+	var p146 = choiceParser{id: 146, commit: 258, name: "flag"}
+	var p115 = sequenceParser{id: 115, commit: 264, name: "alias", allChars: true, ranges: [][]int{{1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}}, generalizations: []int{146}}
+	var p110 = charParser{id: 110, chars: []rune{97}}
+	var p111 = charParser{id: 111, chars: []rune{108}}
+	var p112 = charParser{id: 112, chars: []rune{105}}
+	var p113 = charParser{id: 113, chars: []rune{97}}
+	var p114 = charParser{id: 114, chars: []rune{115}}
+	p115.items = []parser{&p110, &p111, &p112, &p113, &p114}
+	var p118 = sequenceParser{id: 118, commit: 264, name: "ws", allChars: true, ranges: [][]int{{1, 1}, {1, 1}, {1, 1}, {1, 1}}, generalizations: []int{146}}
+	var p116 = charParser{id: 116, chars: []rune{119}}
+	var p117 = charParser{id: 117, chars: []rune{115}}
+	p118.items = []parser{&p116, &p117}
+	var p123 = sequenceParser{id: 123, commit: 264, name: "nows", allChars: true, ranges: [][]int{{1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}}, generalizations: []int{146}}
+	var p119 = charParser{id: 119, chars: []rune{110}}
+	var p120 = charParser{id: 120, chars: []rune{111}}
+	var p121 = charParser{id: 121, chars: []rune{119}}
+	var p122 = charParser{id: 122, chars: []rune{115}}
+	p123.items = []parser{&p119, &p120, &p121, &p122}
+	var p126 = sequenceParser{id: 126, commit: 264, name: "kw", allChars: true, ranges: [][]int{{1, 1}, {1, 1}, {1, 1}, {1, 1}}, generalizations: []int{146}}
+	var p124 = charParser{id: 124, chars: []rune{107}}
+	var p125 = charParser{id: 125, chars: []rune{119}}
+	p126.items = []parser{&p124, &p125}
+	var p131 = sequenceParser{id: 131, commit: 264, name: "nokw", allChars: true, ranges: [][]int{{1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}}, generalizations: []int{146}}
+	var p127 = charParser{id: 127, chars: []rune{110}}
+	var p128 = charParser{id: 128, chars: []rune{111}}
+	var p129 = charParser{id: 129, chars: []rune{107}}
+	var p130 = charParser{id: 130, chars: []rune{119}}
+	p131.items = []parser{&p127, &p128, &p129, &p130}
+	var p140 = sequenceParser{id: 140, commit: 264, name: "failpass", allChars: true, ranges: [][]int{{1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}}, generalizations: []int{146}}
+	var p132 = charParser{id: 132, chars: []rune{102}}
+	var p133 = charParser{id: 133, chars: []rune{97}}
+	var p134 = charParser{id: 134, chars: []rune{105}}
 	var p135 = charParser{id: 135, chars: []rune{108}}
-	var p136 = charParser{id: 136, chars: []rune{105}}
+	var p136 = charParser{id: 136, chars: []rune{112}}
 	var p137 = charParser{id: 137, chars: []rune{97}}
 	var p138 = charParser{id: 138, chars: []rune{115}}
-	p139.items = []parser{&p134, &p135, &p136, &p137, &p138}
-	var p142 = sequenceParser{id: 142, commit: 264, name: "ws", allChars: true, ranges: [][]int{{1, 1}, {1, 1}, {1, 1}, {1, 1}}, generalizations: []int{170}}
-	var p140 = charParser{id: 140, chars: []rune{119}}
-	var p141 = charParser{id: 141, chars: []rune{115}}
-	p142.items = []parser{&p140, &p141}
-	var p147 = sequenceParser{id: 147, commit: 264, name: "nows", allChars: true, ranges: [][]int{{1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}}, generalizations: []int{170}}
-	var p143 = charParser{id: 143, chars: []rune{110}}
-	var p144 = charParser{id: 144, chars: []rune{111}}
-	var p145 = charParser{id: 145, chars: []rune{119}}
-	var p146 = charParser{id: 146, chars: []rune{115}}
-	p147.items = []parser{&p143, &p144, &p145, &p146}
-	var p150 = sequenceParser{id: 150, commit: 264, name: "kw", allChars: true, ranges: [][]int{{1, 1}, {1, 1}, {1, 1}, {1, 1}}, generalizations: []int{170}}
-	var p148 = charParser{id: 148, chars: []rune{107}}
-	var p149 = charParser{id: 149, chars: []rune{119}}
-	p150.items = []parser{&p148, &p149}
-	var p155 = sequenceParser{id: 155, commit: 264, name: "nokw", allChars: true, ranges: [][]int{{1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}}, generalizations: []int{170}}
-	var p151 = charParser{id: 151, chars: []rune{110}}
-	var p152 = charParser{id: 152, chars: []rune{111}}
-	var p153 = charParser{id: 153, chars: []rune{107}}
-	var p154 = charParser{id: 154, chars: []rune{119}}
-	p155.items = []parser{&p151, &p152, &p153, &p154}
-	var p164 = sequenceParser{id: 164, commit: 264, name: "failpass", allChars: true, ranges: [][]int{{1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}}, generalizations: []int{170}}
-	var p156 = charParser{id: 156, chars: []rune{102}}
-	var p157 = charParser{id: 157, chars: []rune{97}}
-	var p158 = charParser{id: 158, chars: []rune{105}}
-	var p159 = charParser{id: 159, chars: []rune{108}}
-	var p160 = charParser{id: 160, chars: []rune{112}}
-	var p161 = charParser{id: 161, chars: []rune{97}}
-	var p162 = charParser{id: 162, chars: []rune{115}}
-	var p163 = charParser{id: 163, chars: []rune{115}}
-	p164.items = []parser{&p156, &p157, &p158, &p159, &p160, &p161, &p162, &p163}
-	var p169 = sequenceParser{id: 169, commit: 264, name: "root", allChars: true, ranges: [][]int{{1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}}, generalizations: []int{170}}
-	var p165 = charParser{id: 165, chars: []rune{114}}
-	var p166 = charParser{id: 166, chars: []rune{111}}
-	var p167 = charParser{id: 167, chars: []rune{111}}
-	var p168 = charParser{id: 168, chars: []rune{116}}
-	p169.items = []parser{&p165, &p166, &p167, &p168}
-	p170.options = []parser{&p139, &p142, &p147, &p150, &p155, &p164, &p169}
-	p173.items = []parser{&p172, &p170}
-	p174.items = []parser{&p92, &p173}
-	var p176 = sequenceParser{id: 176, commit: 10, allChars: true, ranges: [][]int{{1, 1}, {1, 1}}}
-	var p175 = charParser{id: 175, chars: []rune{61}}
-	p176.items = []parser{&p175}
-	var p98 = choiceParser{id: 98, commit: 258, name: "expression"}
-	var p89 = choiceParser{id: 89, commit: 258, name: "terminal", generalizations: []int{98, 124, 128}}
-	var p56 = sequenceParser{id: 56, commit: 264, name: "any-char", allChars: true, ranges: [][]int{{1, 1}, {1, 1}}, generalizations: []int{89, 98, 124, 128}}
-	var p55 = charParser{id: 55, chars: []rune{46}}
-	p56.items = []parser{&p55}
-	var p75 = sequenceParser{id: 75, commit: 264, name: "char-class", ranges: [][]int{{1, 1}, {0, 1}, {0, -1}, {1, 1}, {1, 1}, {0, 1}, {0, -1}, {1, 1}}, generalizations: []int{89, 98, 124, 128}}
-	var p71 = sequenceParser{id: 71, commit: 10, allChars: true, ranges: [][]int{{1, 1}, {1, 1}}}
-	var p70 = charParser{id: 70, chars: []rune{91}}
-	p71.items = []parser{&p70}
-	var p58 = sequenceParser{id: 58, commit: 264, name: "class-not", allChars: true, ranges: [][]int{{1, 1}, {1, 1}}}
-	var p57 = charParser{id: 57, chars: []rune{94}}
-	p58.items = []parser{&p57}
-	var p72 = choiceParser{id: 72, commit: 10}
-	var p66 = choiceParser{id: 66, commit: 264, name: "class-char", generalizations: []int{72}}
-	var p60 = sequenceParser{id: 60, commit: 10, allChars: true, ranges: [][]int{{1, 1}, {1, 1}}, generalizations: []int{66, 72}}
-	var p59 = charParser{id: 59, not: true, chars: []rune{92, 91, 93, 94, 45}}
-	p60.items = []parser{&p59}
-	var p65 = sequenceParser{id: 65, commit: 10, ranges: [][]int{{1, 1}, {1, 1}, {1, 1}, {1, 1}}, generalizations: []int{66, 72}}
-	var p62 = sequenceParser{id: 62, commit: 10, allChars: true, ranges: [][]int{{1, 1}, {1, 1}}}
-	var p61 = charParser{id: 61, chars: []rune{92}}
-	p62.items = []parser{&p61}
-	var p64 = sequenceParser{id: 64, commit: 10, allChars: true, ranges: [][]int{{1, 1}, {1, 1}}}
-	var p63 = charParser{id: 63, not: true}
-	p64.items = []parser{&p63}
-	p65.items = []parser{&p62, &p64}
-	p66.options = []parser{&p60, &p65}
-	var p69 = sequenceParser{id: 69, commit: 264, name: "char-range", ranges: [][]int{{1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}}, generalizations: []int{72}}
-	var p68 = sequenceParser{id: 68, commit: 10, allChars: true, ranges: [][]int{{1, 1}, {1, 1}}}
-	var p67 = charParser{id: 67, chars: []rune{45}}
-	p68.items = []parser{&p67}
-	p69.items = []parser{&p66, &p68, &p66}
-	p72.options = []parser{&p66, &p69}
-	var p74 = sequenceParser{id: 74, commit: 10, allChars: true, ranges: [][]int{{1, 1}, {1, 1}}}
-	var p73 = charParser{id: 73, chars: []rune{93}}
-	p74.items = []parser{&p73}
-	p75.items = []parser{&p71, &p58, &p72, &p74}
-	var p88 = sequenceParser{id: 88, commit: 264, name: "char-sequence", ranges: [][]int{{1, 1}, {0, -1}, {1, 1}, {1, 1}, {0, -1}, {1, 1}}, generalizations: []int{89, 98, 124, 128}}
-	var p85 = sequenceParser{id: 85, commit: 10, allChars: true, ranges: [][]int{{1, 1}, {1, 1}}}
-	var p84 = charParser{id: 84, chars: []rune{34}}
-	p85.items = []parser{&p84}
-	var p83 = choiceParser{id: 83, commit: 264, name: "sequence-char"}
-	var p77 = sequenceParser{id: 77, commit: 10, allChars: true, ranges: [][]int{{1, 1}, {1, 1}}, generalizations: []int{83}}
-	var p76 = charParser{id: 76, not: true, chars: []rune{92, 34}}
+	var p139 = charParser{id: 139, chars: []rune{115}}
+	p140.items = []parser{&p132, &p133, &p134, &p135, &p136, &p137, &p138, &p139}
+	var p145 = sequenceParser{id: 145, commit: 264, name: "root", allChars: true, ranges: [][]int{{1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}}, generalizations: []int{146}}
+	var p141 = charParser{id: 141, chars: []rune{114}}
+	var p142 = charParser{id: 142, chars: []rune{111}}
+	var p143 = charParser{id: 143, chars: []rune{111}}
+	var p144 = charParser{id: 144, chars: []rune{116}}
+	p145.items = []parser{&p141, &p142, &p143, &p144}
+	p146.options = []parser{&p115, &p118, &p123, &p126, &p131, &p140, &p145}
+	p149.items = []parser{&p148, &p146}
+	p150.items = []parser{&p68, &p149}
+	var p152 = sequenceParser{id: 152, commit: 10, allChars: true, ranges: [][]int{{1, 1}, {1, 1}}}
+	var p151 = charParser{id: 151, chars: []rune{61}}
+	p152.items = []parser{&p151}
+	var p74 = choiceParser{id: 74, commit: 258, name: "expression"}
+	var p65 = choiceParser{id: 65, commit: 258, name: "terminal", generalizations: []int{74, 100, 104}}
+	var p32 = sequenceParser{id: 32, commit: 264, name: "any-char", allChars: true, ranges: [][]int{{1, 1}, {1, 1}}, generalizations: []int{65, 74, 100, 104}}
+	var p31 = charParser{id: 31, chars: []rune{46}}
+	p32.items = []parser{&p31}
+	var p51 = sequenceParser{id: 51, commit: 264, name: "char-class", ranges: [][]int{{1, 1}, {0, 1}, {0, -1}, {1, 1}, {1, 1}, {0, 1}, {0, -1}, {1, 1}}, generalizations: []int{65, 74, 100, 104}}
+	var p47 = sequenceParser{id: 47, commit: 10, allChars: true, ranges: [][]int{{1, 1}, {1, 1}}}
+	var p46 = charParser{id: 46, chars: []rune{91}}
+	p47.items = []parser{&p46}
+	var p34 = sequenceParser{id: 34, commit: 264, name: "class-not", allChars: true, ranges: [][]int{{1, 1}, {1, 1}}}
+	var p33 = charParser{id: 33, chars: []rune{94}}
+	p34.items = []parser{&p33}
+	var p48 = choiceParser{id: 48, commit: 10}
+	var p42 = choiceParser{id: 42, commit: 264, name: "class-char", generalizations: []int{48}}
+	var p36 = sequenceParser{id: 36, commit: 10, allChars: true, ranges: [][]int{{1, 1}, {1, 1}}, generalizations: []int{42, 48}}
+	var p35 = charParser{id: 35, not: true, chars: []rune{92, 91, 93, 94, 45}}
+	p36.items = []parser{&p35}
+	var p41 = sequenceParser{id: 41, commit: 10, ranges: [][]int{{1, 1}, {1, 1}, {1, 1}, {1, 1}}, generalizations: []int{42, 48}}
+	var p38 = sequenceParser{id: 38, commit: 10, allChars: true, ranges: [][]int{{1, 1}, {1, 1}}}
+	var p37 = charParser{id: 37, chars: []rune{92}}
+	p38.items = []parser{&p37}
+	var p40 = sequenceParser{id: 40, commit: 10, allChars: true, ranges: [][]int{{1, 1}, {1, 1}}}
+	var p39 = charParser{id: 39, not: true}
+	p40.items = []parser{&p39}
+	p41.items = []parser{&p38, &p40}
+	p42.options = []parser{&p36, &p41}
+	var p45 = sequenceParser{id: 45, commit: 264, name: "char-range", ranges: [][]int{{1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}}, generalizations: []int{48}}
+	var p44 = sequenceParser{id: 44, commit: 10, allChars: true, ranges: [][]int{{1, 1}, {1, 1}}}
+	var p43 = charParser{id: 43, chars: []rune{45}}
+	p44.items = []parser{&p43}
+	p45.items = []parser{&p42, &p44, &p42}
+	p48.options = []parser{&p42, &p45}
+	var p50 = sequenceParser{id: 50, commit: 10, allChars: true, ranges: [][]int{{1, 1}, {1, 1}}}
+	var p49 = charParser{id: 49, chars: []rune{93}}
+	p50.items = []parser{&p49}
+	p51.items = []parser{&p47, &p34, &p48, &p50}
+	var p64 = sequenceParser{id: 64, commit: 264, name: "char-sequence", ranges: [][]int{{1, 1}, {0, -1}, {1, 1}, {1, 1}, {0, -1}, {1, 1}}, generalizations: []int{65, 74, 100, 104}}
+	var p61 = sequenceParser{id: 61, commit: 10, allChars: true, ranges: [][]int{{1, 1}, {1, 1}}}
+	var p60 = charParser{id: 60, chars: []rune{34}}
+	p61.items = []parser{&p60}
+	var p59 = choiceParser{id: 59, commit: 264, name: "sequence-char"}
+	var p53 = sequenceParser{id: 53, commit: 10, allChars: true, ranges: [][]int{{1, 1}, {1, 1}}, generalizations: []int{59}}
+	var p52 = charParser{id: 52, not: true, chars: []rune{92, 34}}
+	p53.items = []parser{&p52}
+	var p58 = sequenceParser{id: 58, commit: 10, ranges: [][]int{{1, 1}, {1, 1}, {1, 1}, {1, 1}}, generalizations: []int{59}}
+	var p55 = sequenceParser{id: 55, commit: 10, allChars: true, ranges: [][]int{{1, 1}, {1, 1}}}
+	var p54 = charParser{id: 54, chars: []rune{92}}
+	p55.items = []parser{&p54}
+	var p57 = sequenceParser{id: 57, commit: 10, allChars: true, ranges: [][]int{{1, 1}, {1, 1}}}
+	var p56 = charParser{id: 56, not: true}
+	p57.items = []parser{&p56}
+	p58.items = []parser{&p55, &p57}
+	p59.options = []parser{&p53, &p58}
+	var p63 = sequenceParser{id: 63, commit: 10, allChars: true, ranges: [][]int{{1, 1}, {1, 1}}}
+	var p62 = charParser{id: 62, chars: []rune{34}}
+	p63.items = []parser{&p62}
+	p64.items = []parser{&p61, &p59, &p63}
+	p65.options = []parser{&p32, &p51, &p64}
+	var p73 = sequenceParser{id: 73, commit: 258, name: "group", ranges: [][]int{{1, 1}, {0, -1}, {1, 1}, {0, -1}, {1, 1}}, generalizations: []int{74, 100, 104}}
+	var p70 = sequenceParser{id: 70, commit: 10, allChars: true, ranges: [][]int{{1, 1}, {1, 1}}}
+	var p69 = charParser{id: 69, chars: []rune{40}}
+	p70.items = []parser{&p69}
+	var p72 = sequenceParser{id: 72, commit: 10, allChars: true, ranges: [][]int{{1, 1}, {1, 1}}}
+	var p71 = charParser{id: 71, chars: []rune{41}}
+	p72.items = []parser{&p71}
+	p73.items = []parser{&p70, &p170, &p74, &p170, &p72}
+	var p103 = sequenceParser{id: 103, commit: 256, name: "sequence", ranges: [][]int{{1, 1}, {0, -1}}, generalizations: []int{74, 104}}
+	var p101 = sequenceParser{id: 101, commit: 264, name: "item", ranges: [][]int{{1, 1}, {0, 1}, {1, 1}, {0, 1}}}
+	var p100 = choiceParser{id: 100, commit: 10}
+	p100.options = []parser{&p65, &p68, &p73}
+	var p99 = choiceParser{id: 99, commit: 258, name: "quantity"}
+	var p83 = sequenceParser{id: 83, commit: 256, name: "count-quantifier", ranges: [][]int{{1, 1}, {0, -1}, {1, 1}, {0, -1}, {1, 1}}, generalizations: []int{99}}
+	var p80 = sequenceParser{id: 80, commit: 10, allChars: true, ranges: [][]int{{1, 1}, {1, 1}}}
+	var p79 = charParser{id: 79, chars: []rune{123}}
+	p80.items = []parser{&p79}
+	var p78 = sequenceParser{id: 78, commit: 256, name: "count", ranges: [][]int{{1, 1}}}
+	var p77 = sequenceParser{id: 77, commit: 266, name: "number", ranges: [][]int{{1, -1}, {1, -1}}}
+	var p76 = sequenceParser{id: 76, commit: 10, allChars: true, ranges: [][]int{{1, 1}, {1, 1}}}
+	var p75 = charParser{id: 75, ranges: [][]rune{{48, 57}}}
+	p76.items = []parser{&p75}
 	p77.items = []parser{&p76}
-	var p82 = sequenceParser{id: 82, commit: 10, ranges: [][]int{{1, 1}, {1, 1}, {1, 1}, {1, 1}}, generalizations: []int{83}}
-	var p79 = sequenceParser{id: 79, commit: 10, allChars: true, ranges: [][]int{{1, 1}, {1, 1}}}
-	var p78 = charParser{id: 78, chars: []rune{92}}
-	p79.items = []parser{&p78}
-	var p81 = sequenceParser{id: 81, commit: 10, allChars: true, ranges: [][]int{{1, 1}, {1, 1}}}
-	var p80 = charParser{id: 80, not: true}
-	p81.items = []parser{&p80}
-	p82.items = []parser{&p79, &p81}
-	p83.options = []parser{&p77, &p82}
+	p78.items = []parser{&p77}
+	var p82 = sequenceParser{id: 82, commit: 10, allChars: true, ranges: [][]int{{1, 1}, {1, 1}}}
+	var p81 = charParser{id: 81, chars: []rune{125}}
+	p82.items = []parser{&p81}
+	p83.items = []parser{&p80, &p170, &p78, &p170, &p82}
+	var p92 = sequenceParser{id: 92, commit: 256, name: "range-quantifier", ranges: [][]int{{1, 1}, {0, -1}, {0, 1}, {0, -1}, {1, 1}, {0, -1}, {0, 1}, {0, -1}, {1, 1}}, generalizations: []int{99}}
 	var p87 = sequenceParser{id: 87, commit: 10, allChars: true, ranges: [][]int{{1, 1}, {1, 1}}}
-	var p86 = charParser{id: 86, chars: []rune{34}}
+	var p86 = charParser{id: 86, chars: []rune{123}}
 	p87.items = []parser{&p86}
-	p88.items = []parser{&p85, &p83, &p87}
-	p89.options = []parser{&p56, &p75, &p88}
-	var p97 = sequenceParser{id: 97, commit: 258, name: "group", ranges: [][]int{{1, 1}, {0, -1}, {1, 1}, {0, -1}, {1, 1}}, generalizations: []int{98, 124, 128}}
-	var p94 = sequenceParser{id: 94, commit: 10, allChars: true, ranges: [][]int{{1, 1}, {1, 1}}}
-	var p93 = charParser{id: 93, chars: []rune{40}}
+	var p84 = sequenceParser{id: 84, commit: 256, name: "range-from", ranges: [][]int{{1, 1}}}
+	p84.items = []parser{&p77}
+	var p89 = sequenceParser{id: 89, commit: 10, allChars: true, ranges: [][]int{{1, 1}, {1, 1}}}
+	var p88 = charParser{id: 88, chars: []rune{44}}
+	p89.items = []parser{&p88}
+	var p85 = sequenceParser{id: 85, commit: 256, name: "range-to", ranges: [][]int{{1, 1}}}
+	p85.items = []parser{&p77}
+	var p91 = sequenceParser{id: 91, commit: 10, allChars: true, ranges: [][]int{{1, 1}, {1, 1}}}
+	var p90 = charParser{id: 90, chars: []rune{125}}
+	p91.items = []parser{&p90}
+	p92.items = []parser{&p87, &p170, &p84, &p170, &p89, &p170, &p85, &p170, &p91}
+	var p94 = sequenceParser{id: 94, commit: 264, name: "one-or-more", allChars: true, ranges: [][]int{{1, 1}, {1, 1}}, generalizations: []int{99}}
+	var p93 = charParser{id: 93, chars: []rune{43}}
 	p94.items = []parser{&p93}
-	var p96 = sequenceParser{id: 96, commit: 10, allChars: true, ranges: [][]int{{1, 1}, {1, 1}}}
-	var p95 = charParser{id: 95, chars: []rune{41}}
+	var p96 = sequenceParser{id: 96, commit: 264, name: "zero-or-more", allChars: true, ranges: [][]int{{1, 1}, {1, 1}}, generalizations: []int{99}}
+	var p95 = charParser{id: 95, chars: []rune{42}}
 	p96.items = []parser{&p95}
-	p97.items = []parser{&p94, &p194, &p98, &p194, &p96}
-	var p127 = sequenceParser{id: 127, commit: 256, name: "sequence", ranges: [][]int{{1, 1}, {0, -1}}, generalizations: []int{98, 128}}
-	var p125 = sequenceParser{id: 125, commit: 264, name: "item", ranges: [][]int{{1, 1}, {0, 1}, {1, 1}, {0, 1}}}
-	var p124 = choiceParser{id: 124, commit: 10}
-	p124.options = []parser{&p89, &p92, &p97}
-	var p123 = choiceParser{id: 123, commit: 258, name: "quantity"}
-	var p107 = sequenceParser{id: 107, commit: 256, name: "count-quantifier", ranges: [][]int{{1, 1}, {0, -1}, {1, 1}, {0, -1}, {1, 1}}, generalizations: []int{123}}
-	var p104 = sequenceParser{id: 104, commit: 10, allChars: true, ranges: [][]int{{1, 1}, {1, 1}}}
-	var p103 = charParser{id: 103, chars: []rune{123}}
-	p104.items = []parser{&p103}
-	var p102 = sequenceParser{id: 102, commit: 256, name: "count", ranges: [][]int{{1, 1}}}
-	var p101 = sequenceParser{id: 101, commit: 266, name: "number", ranges: [][]int{{1, -1}, {1, -1}}}
-	var p100 = sequenceParser{id: 100, commit: 10, allChars: true, ranges: [][]int{{1, 1}, {1, 1}}}
-	var p99 = charParser{id: 99, ranges: [][]rune{{48, 57}}}
-	p100.items = []parser{&p99}
-	p101.items = []parser{&p100}
-	p102.items = []parser{&p101}
+	var p98 = sequenceParser{id: 98, commit: 264, name: "zero-or-one", allChars: true, ranges: [][]int{{1, 1}, {1, 1}}, generalizations: []int{99}}
+	var p97 = charParser{id: 97, chars: []rune{63}}
+	p98.items = []parser{&p97}
+	p99.options = []parser{&p83, &p92, &p94, &p96, &p98}
+	p101.items = []parser{&p100, &p99}
+	var p102 = sequenceParser{id: 102, commit: 2, ranges: [][]int{{0, -1}, {1, 1}}}
+	p102.items = []parser{&p170, &p101}
+	p103.items = []parser{&p101, &p102}
+	var p109 = sequenceParser{id: 109, commit: 256, name: "choice", ranges: [][]int{{1, 1}, {0, -1}, {1, 1}, {0, -1}}, generalizations: []int{74}}
+	var p104 = choiceParser{id: 104, commit: 258, name: "option"}
+	p104.options = []parser{&p65, &p68, &p73, &p103}
+	var p107 = sequenceParser{id: 107, commit: 2, ranges: [][]int{{1, 1}, {0, -1}, {1, 1}}}
 	var p106 = sequenceParser{id: 106, commit: 10, allChars: true, ranges: [][]int{{1, 1}, {1, 1}}}
-	var p105 = charParser{id: 105, chars: []rune{125}}
+	var p105 = charParser{id: 105, chars: []rune{124}}
 	p106.items = []parser{&p105}
-	p107.items = []parser{&p104, &p194, &p102, &p194, &p106}
-	var p116 = sequenceParser{id: 116, commit: 256, name: "range-quantifier", ranges: [][]int{{1, 1}, {0, -1}, {0, 1}, {0, -1}, {1, 1}, {0, -1}, {0, 1}, {0, -1}, {1, 1}}, generalizations: []int{123}}
-	var p111 = sequenceParser{id: 111, commit: 10, allChars: true, ranges: [][]int{{1, 1}, {1, 1}}}
-	var p110 = charParser{id: 110, chars: []rune{123}}
-	p111.items = []parser{&p110}
-	var p108 = sequenceParser{id: 108, commit: 256, name: "range-from", ranges: [][]int{{1, 1}}}
-	p108.items = []parser{&p101}
-	var p113 = sequenceParser{id: 113, commit: 10, allChars: true, ranges: [][]int{{1, 1}, {1, 1}}}
-	var p112 = charParser{id: 112, chars: []rune{44}}
-	p113.items = []parser{&p112}
-	var p109 = sequenceParser{id: 109, commit: 256, name: "range-to", ranges: [][]int{{1, 1}}}
-	p109.items = []parser{&p101}
-	var p115 = sequenceParser{id: 115, commit: 10, allChars: true, ranges: [][]int{{1, 1}, {1, 1}}}
-	var p114 = charParser{id: 114, chars: []rune{125}}
-	p115.items = []parser{&p114}
-	p116.items = []parser{&p111, &p194, &p108, &p194, &p113, &p194, &p109, &p194, &p115}
-	var p118 = sequenceParser{id: 118, commit: 264, name: "one-or-more", allChars: true, ranges: [][]int{{1, 1}, {1, 1}}, generalizations: []int{123}}
-	var p117 = charParser{id: 117, chars: []rune{43}}
-	p118.items = []parser{&p117}
-	var p120 = sequenceParser{id: 120, commit: 264, name: "zero-or-more", allChars: true, ranges: [][]int{{1, 1}, {1, 1}}, generalizations: []int{123}}
-	var p119 = charParser{id: 119, chars: []rune{42}}
-	p120.items = []parser{&p119}
-	var p122 = sequenceParser{id: 122, commit: 264, name: "zero-or-one", allChars: true, ranges: [][]int{{1, 1}, {1, 1}}, generalizations: []int{123}}
-	var p121 = charParser{id: 121, chars: []rune{63}}
-	p122.items = []parser{&p121}
-	p123.options = []parser{&p107, &p116, &p118, &p120, &p122}
-	p125.items = []parser{&p124, &p123}
-	var p126 = sequenceParser{id: 126, commit: 2, ranges: [][]int{{0, -1}, {1, 1}}}
-	p126.items = []parser{&p194, &p125}
-	p127.items = []parser{&p125, &p126}
-	var p133 = sequenceParser{id: 133, commit: 256, name: "choice", ranges: [][]int{{1, 1}, {0, -1}, {1, 1}, {0, -1}}, generalizations: []int{98}}
-	var p128 = choiceParser{id: 128, commit: 258, name: "option"}
-	p128.options = []parser{&p89, &p92, &p97, &p127}
-	var p131 = sequenceParser{id: 131, commit: 2, ranges: [][]int{{1, 1}, {0, -1}, {1, 1}}}
-	var p130 = sequenceParser{id: 130, commit: 10, allChars: true, ranges: [][]int{{1, 1}, {1, 1}}}
-	var p129 = charParser{id: 129, chars: []rune{124}}
-	p130.items = []parser{&p129}
-	p131.items = []parser{&p130, &p194, &p128}
-	var p132 = sequenceParser{id: 132, commit: 2, ranges: [][]int{{0, -1}, {1, 1}}}
-	p132.items = []parser{&p194, &p131}
-	p133.items = []parser{&p128, &p194, &p131, &p132}
-	p98.options = []parser{&p89, &p92, &p97, &p127, &p133}
-	p177.items = []parser{&p174, &p194, &p176, &p194, &p98}
-	var p183 = sequenceParser{id: 183, commit: 2, ranges: [][]int{{0, -1}, {1, 1}, {0, -1}}}
-	var p181 = sequenceParser{id: 181, commit: 2, ranges: [][]int{{1, 1}, {0, -1}, {0, -1}, {1, 1}}}
-	var p179 = sequenceParser{id: 179, commit: 10, allChars: true, ranges: [][]int{{1, 1}, {1, 1}}}
-	var p178 = charParser{id: 178, chars: []rune{59}}
-	p179.items = []parser{&p178}
-	var p180 = sequenceParser{id: 180, commit: 2, ranges: [][]int{{0, -1}, {1, 1}}}
-	p180.items = []parser{&p194, &p179}
-	p181.items = []parser{&p179, &p180, &p194, &p177}
-	var p182 = sequenceParser{id: 182, commit: 2, ranges: [][]int{{0, -1}, {1, 1}}}
-	p182.items = []parser{&p194, &p181}
-	p183.items = []parser{&p194, &p181, &p182}
-	p184.items = []parser{&p177, &p183}
-	var p192 = sequenceParser{id: 192, commit: 2, ranges: [][]int{{0, -1}, {1, 1}, {0, -1}}}
-	var p188 = sequenceParser{id: 188, commit: 10, allChars: true, ranges: [][]int{{1, 1}, {1, 1}}}
-	var p187 = charParser{id: 187, chars: []rune{59}}
-	p188.items = []parser{&p187}
-	var p191 = sequenceParser{id: 191, commit: 2, ranges: [][]int{{0, -1}, {1, 1}}}
-	p191.items = []parser{&p194, &p188}
-	p192.items = []parser{&p194, &p188, &p191}
-	p195.items = []parser{&p190, &p194, &p184, &p192}
-	p196.items = []parser{&p194, &p195, &p194}
-	var b196 = sequenceBuilder{id: 196, commit: 128, name: "syntax", ranges: [][]int{{0, -1}, {1, 1}, {0, -1}}}
-	var b194 = choiceBuilder{id: 194, commit: 2}
-	var b193 = choiceBuilder{id: 193, commit: 262, generalizations: []int{194}}
-	var b15 = choiceBuilder{id: 15, commit: 258, generalizations: []int{193, 194}}
-	var b2 = sequenceBuilder{id: 2, commit: 10, allChars: true, ranges: [][]int{{1, 1}, {1, 1}}, generalizations: []int{15, 193, 194}}
+	p107.items = []parser{&p106, &p170, &p104}
+	var p108 = sequenceParser{id: 108, commit: 2, ranges: [][]int{{0, -1}, {1, 1}}}
+	p108.items = []parser{&p170, &p107}
+	p109.items = []parser{&p104, &p170, &p107, &p108}
+	p74.options = []parser{&p65, &p68, &p73, &p103, &p109}
+	p153.items = []parser{&p150, &p170, &p152, &p170, &p74}
+	var p159 = sequenceParser{id: 159, commit: 2, ranges: [][]int{{0, -1}, {1, 1}, {0, -1}}}
+	var p157 = sequenceParser{id: 157, commit: 2, ranges: [][]int{{1, 1}, {0, -1}, {0, -1}, {1, 1}}}
+	var p155 = sequenceParser{id: 155, commit: 10, allChars: true, ranges: [][]int{{1, 1}, {1, 1}}}
+	var p154 = charParser{id: 154, chars: []rune{59}}
+	p155.items = []parser{&p154}
+	var p156 = sequenceParser{id: 156, commit: 2, ranges: [][]int{{0, -1}, {1, 1}}}
+	p156.items = []parser{&p170, &p155}
+	p157.items = []parser{&p155, &p156, &p170, &p153}
+	var p158 = sequenceParser{id: 158, commit: 2, ranges: [][]int{{0, -1}, {1, 1}}}
+	p158.items = []parser{&p170, &p157}
+	p159.items = []parser{&p170, &p157, &p158}
+	p160.items = []parser{&p153, &p159}
+	var p168 = sequenceParser{id: 168, commit: 2, ranges: [][]int{{0, -1}, {1, 1}, {0, -1}}}
+	var p164 = sequenceParser{id: 164, commit: 10, allChars: true, ranges: [][]int{{1, 1}, {1, 1}}}
+	var p163 = charParser{id: 163, chars: []rune{59}}
+	p164.items = []parser{&p163}
+	var p167 = sequenceParser{id: 167, commit: 2, ranges: [][]int{{0, -1}, {1, 1}}}
+	p167.items = []parser{&p170, &p164}
+	p168.items = []parser{&p170, &p164, &p167}
+	p171.items = []parser{&p166, &p170, &p160, &p168}
+	p172.items = []parser{&p170, &p171, &p170}
+	var b172 = sequenceBuilder{id: 172, commit: 128, name: "syntax", ranges: [][]int{{0, -1}, {1, 1}, {0, -1}}}
+	var b170 = choiceBuilder{id: 170, commit: 2}
+	var b169 = choiceBuilder{id: 169, commit: 262, generalizations: []int{170}}
+	var b2 = sequenceBuilder{id: 2, commit: 258, allChars: true, ranges: [][]int{{1, 1}}, generalizations: []int{169, 170}}
 	var b1 = charBuilder{}
 	b2.items = []builder{&b1}
-	var b4 = sequenceBuilder{id: 4, commit: 10, allChars: true, ranges: [][]int{{1, 1}, {1, 1}}, generalizations: []int{15, 193, 194}}
-	var b3 = charBuilder{}
-	b4.items = []builder{&b3}
-	var b6 = sequenceBuilder{id: 6, commit: 10, allChars: true, ranges: [][]int{{1, 1}, {1, 1}}, generalizations: []int{15, 193, 194}}
+	var b30 = sequenceBuilder{id: 30, commit: 264, name: "comment", ranges: [][]int{{1, 1}, {0, -1}, {1, 1}, {0, -1}}, generalizations: []int{169, 170}}
+	var b26 = choiceBuilder{id: 26, commit: 266}
+	var b25 = sequenceBuilder{id: 25, commit: 266, ranges: [][]int{{1, 1}, {0, -1}, {1, 1}, {0, -1}}, generalizations: []int{26}}
+	var b22 = sequenceBuilder{id: 22, commit: 10, allChars: true, ranges: [][]int{{1, 1}, {1, 1}, {1, 1}, {1, 1}}}
+	var b20 = charBuilder{}
+	var b21 = charBuilder{}
+	b22.items = []builder{&b20, &b21}
+	var b24 = sequenceBuilder{id: 24, commit: 10, allChars: true, ranges: [][]int{{1, 1}, {1, 1}}}
+	var b23 = charBuilder{}
+	b24.items = []builder{&b23}
+	b25.items = []builder{&b22, &b24}
+	var b19 = sequenceBuilder{id: 19, commit: 266, ranges: [][]int{{1, 1}, {0, -1}, {1, 1}, {1, 1}, {0, -1}, {1, 1}}, generalizations: []int{26}}
+	var b7 = sequenceBuilder{id: 7, commit: 10, allChars: true, ranges: [][]int{{1, 1}, {1, 1}, {1, 1}, {1, 1}}}
 	var b5 = charBuilder{}
-	b6.items = []builder{&b5}
-	var b8 = sequenceBuilder{id: 8, commit: 10, allChars: true, ranges: [][]int{{1, 1}, {1, 1}}, generalizations: []int{15, 193, 194}}
-	var b7 = charBuilder{}
-	b8.items = []builder{&b7}
-	var b10 = sequenceBuilder{id: 10, commit: 10, allChars: true, ranges: [][]int{{1, 1}, {1, 1}}, generalizations: []int{15, 193, 194}}
-	var b9 = charBuilder{}
-	b10.items = []builder{&b9}
-	var b12 = sequenceBuilder{id: 12, commit: 10, allChars: true, ranges: [][]int{{1, 1}, {1, 1}}, generalizations: []int{15, 193, 194}}
-	var b11 = charBuilder{}
-	b12.items = []builder{&b11}
-	var b14 = sequenceBuilder{id: 14, commit: 10, allChars: true, ranges: [][]int{{1, 1}, {1, 1}}, generalizations: []int{15, 193, 194}}
+	var b6 = charBuilder{}
+	b7.items = []builder{&b5, &b6}
+	var b15 = choiceBuilder{id: 15, commit: 10}
+	var b12 = sequenceBuilder{id: 12, commit: 10, ranges: [][]int{{1, 1}, {1, 1}, {1, 1}, {1, 1}}, generalizations: []int{15}}
+	var b9 = sequenceBuilder{id: 9, commit: 10, allChars: true, ranges: [][]int{{1, 1}, {1, 1}}}
+	var b8 = charBuilder{}
+	b9.items = []builder{&b8}
+	var b11 = sequenceBuilder{id: 11, commit: 10, allChars: true, ranges: [][]int{{1, 1}, {1, 1}}}
+	var b10 = charBuilder{}
+	b11.items = []builder{&b10}
+	b12.items = []builder{&b9, &b11}
+	var b14 = sequenceBuilder{id: 14, commit: 10, allChars: true, ranges: [][]int{{1, 1}, {1, 1}}, generalizations: []int{15}}
 	var b13 = charBuilder{}
 	b14.items = []builder{&b13}
-	b15.options = []builder{&b2, &b4, &b6, &b8, &b10, &b12, &b14}
-	var b54 = sequenceBuilder{id: 54, commit: 264, name: "comment", ranges: [][]int{{1, 1}, {0, -1}, {1, 1}, {0, -1}}, generalizations: []int{193, 194}}
-	var b50 = choiceBuilder{id: 50, commit: 266}
-	var b49 = sequenceBuilder{id: 49, commit: 266, ranges: [][]int{{1, 1}, {0, -1}, {1, 1}, {0, -1}}, generalizations: []int{50}}
-	var b46 = sequenceBuilder{id: 46, commit: 10, allChars: true, ranges: [][]int{{1, 1}, {1, 1}, {1, 1}, {1, 1}}}
-	var b44 = charBuilder{}
-	var b45 = charBuilder{}
-	b46.items = []builder{&b44, &b45}
-	var b48 = sequenceBuilder{id: 48, commit: 10, allChars: true, ranges: [][]int{{1, 1}, {1, 1}}}
-	var b47 = charBuilder{}
-	b48.items = []builder{&b47}
-	b49.items = []builder{&b46, &b48}
-	var b43 = sequenceBuilder{id: 43, commit: 266, ranges: [][]int{{1, 1}, {0, -1}, {1, 1}, {1, 1}, {0, -1}, {1, 1}}, generalizations: []int{50}}
-	var b31 = sequenceBuilder{id: 31, commit: 10, allChars: true, ranges: [][]int{{1, 1}, {1, 1}, {1, 1}, {1, 1}}}
-	var b29 = charBuilder{}
-	var b30 = charBuilder{}
-	b31.items = []builder{&b29, &b30}
-	var b39 = choiceBuilder{id: 39, commit: 10}
-	var b36 = sequenceBuilder{id: 36, commit: 10, ranges: [][]int{{1, 1}, {1, 1}, {1, 1}, {1, 1}}, generalizations: []int{39}}
-	var b33 = sequenceBuilder{id: 33, commit: 10, allChars: true, ranges: [][]int{{1, 1}, {1, 1}}}
-	var b32 = charBuilder{}
-	b33.items = []builder{&b32}
-	var b35 = sequenceBuilder{id: 35, commit: 10, allChars: true, ranges: [][]int{{1, 1}, {1, 1}}}
-	var b34 = charBuilder{}
-	b35.items = []builder{&b34}
-	b36.items = []builder{&b33, &b35}
-	var b38 = sequenceBuilder{id: 38, commit: 10, allChars: true, ranges: [][]int{{1, 1}, {1, 1}}, generalizations: []int{39}}
-	var b37 = charBuilder{}
-	b38.items = []builder{&b37}
-	b39.options = []builder{&b36, &b38}
-	var b42 = sequenceBuilder{id: 42, commit: 10, allChars: true, ranges: [][]int{{1, 1}, {1, 1}, {1, 1}, {1, 1}}}
-	var b40 = charBuilder{}
-	var b41 = charBuilder{}
-	b42.items = []builder{&b40, &b41}
-	b43.items = []builder{&b31, &b39, &b42}
-	b50.options = []builder{&b49, &b43}
-	var b53 = sequenceBuilder{id: 53, commit: 10, ranges: [][]int{{0, -1}, {0, 1}, {0, -1}, {1, 1}, {0, -1}, {0, 1}, {0, -1}, {1, 1}}}
-	var b28 = choiceBuilder{id: 28, commit: 266}
-	var b17 = sequenceBuilder{id: 17, commit: 10, allChars: true, ranges: [][]int{{1, 1}, {1, 1}}, generalizations: []int{28}}
+	b15.options = []builder{&b12, &b14}
+	var b18 = sequenceBuilder{id: 18, commit: 10, allChars: true, ranges: [][]int{{1, 1}, {1, 1}, {1, 1}, {1, 1}}}
 	var b16 = charBuilder{}
-	b17.items = []builder{&b16}
-	var b19 = sequenceBuilder{id: 19, commit: 10, allChars: true, ranges: [][]int{{1, 1}, {1, 1}}, generalizations: []int{28}}
-	var b18 = charBuilder{}
-	b19.items = []builder{&b18}
-	var b21 = sequenceBuilder{id: 21, commit: 10, allChars: true, ranges: [][]int{{1, 1}, {1, 1}}, generalizations: []int{28}}
-	var b20 = charBuilder{}
-	b21.items = []builder{&b20}
-	var b23 = sequenceBuilder{id: 23, commit: 10, allChars: true, ranges: [][]int{{1, 1}, {1, 1}}, generalizations: []int{28}}
-	var b22 = charBuilder{}
-	b23.items = []builder{&b22}
-	var b25 = sequenceBuilder{id: 25, commit: 10, allChars: true, ranges: [][]int{{1, 1}, {1, 1}}, generalizations: []int{28}}
-	var b24 = charBuilder{}
-	b25.items = []builder{&b24}
-	var b27 = sequenceBuilder{id: 27, commit: 10, allChars: true, ranges: [][]int{{1, 1}, {1, 1}}, generalizations: []int{28}}
-	var b26 = charBuilder{}
-	b27.items = []builder{&b26}
-	b28.options = []builder{&b17, &b19, &b21, &b23, &b25, &b27}
-	var b52 = sequenceBuilder{id: 52, commit: 10, allChars: true, ranges: [][]int{{1, 1}, {1, 1}}}
-	var b51 = charBuilder{}
-	b52.items = []builder{&b51}
-	b53.items = []builder{&b28, &b52, &b28, &b50}
-	b54.items = []builder{&b50, &b53}
-	b193.options = []builder{&b15, &b54}
-	b194.options = []builder{&b193}
-	var b195 = sequenceBuilder{id: 195, commit: 258, ranges: [][]int{{0, 1}, {0, -1}, {0, 1}, {0, 1}}}
-	var b190 = sequenceBuilder{id: 190, commit: 2, ranges: [][]int{{1, 1}, {0, -1}}}
-	var b186 = sequenceBuilder{id: 186, commit: 10, allChars: true, ranges: [][]int{{1, 1}, {1, 1}}}
-	var b185 = charBuilder{}
-	b186.items = []builder{&b185}
-	var b189 = sequenceBuilder{id: 189, commit: 2, ranges: [][]int{{0, -1}, {1, 1}}}
-	b189.items = []builder{&b194, &b186}
-	b190.items = []builder{&b186, &b189}
-	var b184 = sequenceBuilder{id: 184, commit: 258, ranges: [][]int{{1, 1}, {0, 1}}}
-	var b177 = sequenceBuilder{id: 177, commit: 256, name: "definition", ranges: [][]int{{1, 1}, {0, -1}, {1, 1}, {0, -1}, {1, 1}}}
-	var b174 = sequenceBuilder{id: 174, commit: 266, ranges: [][]int{{1, 1}, {0, -1}, {1, 1}, {0, -1}}}
-	var b92 = sequenceBuilder{id: 92, commit: 264, name: "symbol", ranges: [][]int{{1, -1}, {1, -1}}, generalizations: []int{98, 124, 128}}
-	var b91 = sequenceBuilder{id: 91, commit: 10, allChars: true, ranges: [][]int{{1, 1}, {1, 1}}}
-	var b90 = charBuilder{}
-	b91.items = []builder{&b90}
-	b92.items = []builder{&b91}
-	var b173 = sequenceBuilder{id: 173, commit: 10, ranges: [][]int{{1, 1}, {1, 1}, {1, 1}, {1, 1}}}
-	var b172 = sequenceBuilder{id: 172, commit: 10, allChars: true, ranges: [][]int{{1, 1}, {1, 1}}}
-	var b171 = charBuilder{}
-	b172.items = []builder{&b171}
-	var b170 = choiceBuilder{id: 170, commit: 258}
-	var b139 = sequenceBuilder{id: 139, commit: 264, name: "alias", allChars: true, ranges: [][]int{{1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}}, generalizations: []int{170}}
+	var b17 = charBuilder{}
+	b18.items = []builder{&b16, &b17}
+	b19.items = []builder{&b7, &b15, &b18}
+	b26.options = []builder{&b25, &b19}
+	var b29 = sequenceBuilder{id: 29, commit: 10, ranges: [][]int{{0, -1}, {0, 1}, {0, -1}, {1, 1}, {0, -1}, {0, 1}, {0, -1}, {1, 1}}}
+	var b4 = sequenceBuilder{id: 4, commit: 266, allChars: true, ranges: [][]int{{1, 1}, {1, 1}}}
+	var b3 = charBuilder{}
+	b4.items = []builder{&b3}
+	var b28 = sequenceBuilder{id: 28, commit: 10, allChars: true, ranges: [][]int{{1, 1}, {1, 1}}}
+	var b27 = charBuilder{}
+	b28.items = []builder{&b27}
+	b29.items = []builder{&b4, &b28, &b4, &b26}
+	b30.items = []builder{&b26, &b29}
+	b169.options = []builder{&b2, &b30}
+	b170.options = []builder{&b169}
+	var b171 = sequenceBuilder{id: 171, commit: 258, ranges: [][]int{{0, 1}, {0, -1}, {0, 1}, {0, 1}}}
+	var b166 = sequenceBuilder{id: 166, commit: 2, ranges: [][]int{{1, 1}, {0, -1}}}
+	var b162 = sequenceBuilder{id: 162, commit: 10, allChars: true, ranges: [][]int{{1, 1}, {1, 1}}}
+	var b161 = charBuilder{}
+	b162.items = []builder{&b161}
+	var b165 = sequenceBuilder{id: 165, commit: 2, ranges: [][]int{{0, -1}, {1, 1}}}
+	b165.items = []builder{&b170, &b162}
+	b166.items = []builder{&b162, &b165}
+	var b160 = sequenceBuilder{id: 160, commit: 258, ranges: [][]int{{1, 1}, {0, 1}}}
+	var b153 = sequenceBuilder{id: 153, commit: 256, name: "definition", ranges: [][]int{{1, 1}, {0, -1}, {1, 1}, {0, -1}, {1, 1}}}
+	var b150 = sequenceBuilder{id: 150, commit: 266, ranges: [][]int{{1, 1}, {0, -1}, {1, 1}, {0, -1}}}
+	var b68 = sequenceBuilder{id: 68, commit: 264, name: "symbol", ranges: [][]int{{1, -1}, {1, -1}}, generalizations: []int{74, 100, 104}}
+	var b67 = sequenceBuilder{id: 67, commit: 10, allChars: true, ranges: [][]int{{1, 1}, {1, 1}}}
+	var b66 = charBuilder{}
+	b67.items = []builder{&b66}
+	b68.items = []builder{&b67}
+	var b149 = sequenceBuilder{id: 149, commit: 10, ranges: [][]int{{1, 1}, {1, 1}, {1, 1}, {1, 1}}}
+	var b148 = sequenceBuilder{id: 148, commit: 10, allChars: true, ranges: [][]int{{1, 1}, {1, 1}}}
+	var b147 = charBuilder{}
+	b148.items = []builder{&b147}
+	var b146 = choiceBuilder{id: 146, commit: 258}
+	var b115 = sequenceBuilder{id: 115, commit: 264, name: "alias", allChars: true, ranges: [][]int{{1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}}, generalizations: []int{146}}
+	var b110 = charBuilder{}
+	var b111 = charBuilder{}
+	var b112 = charBuilder{}
+	var b113 = charBuilder{}
+	var b114 = charBuilder{}
+	b115.items = []builder{&b110, &b111, &b112, &b113, &b114}
+	var b118 = sequenceBuilder{id: 118, commit: 264, name: "ws", allChars: true, ranges: [][]int{{1, 1}, {1, 1}, {1, 1}, {1, 1}}, generalizations: []int{146}}
+	var b116 = charBuilder{}
+	var b117 = charBuilder{}
+	b118.items = []builder{&b116, &b117}
+	var b123 = sequenceBuilder{id: 123, commit: 264, name: "nows", allChars: true, ranges: [][]int{{1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}}, generalizations: []int{146}}
+	var b119 = charBuilder{}
+	var b120 = charBuilder{}
+	var b121 = charBuilder{}
+	var b122 = charBuilder{}
+	b123.items = []builder{&b119, &b120, &b121, &b122}
+	var b126 = sequenceBuilder{id: 126, commit: 264, name: "kw", allChars: true, ranges: [][]int{{1, 1}, {1, 1}, {1, 1}, {1, 1}}, generalizations: []int{146}}
+	var b124 = charBuilder{}
+	var b125 = charBuilder{}
+	b126.items = []builder{&b124, &b125}
+	var b131 = sequenceBuilder{id: 131, commit: 264, name: "nokw", allChars: true, ranges: [][]int{{1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}}, generalizations: []int{146}}
+	var b127 = charBuilder{}
+	var b128 = charBuilder{}
+	var b129 = charBuilder{}
+	var b130 = charBuilder{}
+	b131.items = []builder{&b127, &b128, &b129, &b130}
+	var b140 = sequenceBuilder{id: 140, commit: 264, name: "failpass", allChars: true, ranges: [][]int{{1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}}, generalizations: []int{146}}
+	var b132 = charBuilder{}
+	var b133 = charBuilder{}
 	var b134 = charBuilder{}
 	var b135 = charBuilder{}
 	var b136 = charBuilder{}
 	var b137 = charBuilder{}
 	var b138 = charBuilder{}
-	b139.items = []builder{&b134, &b135, &b136, &b137, &b138}
-	var b142 = sequenceBuilder{id: 142, commit: 264, name: "ws", allChars: true, ranges: [][]int{{1, 1}, {1, 1}, {1, 1}, {1, 1}}, generalizations: []int{170}}
-	var b140 = charBuilder{}
+	var b139 = charBuilder{}
+	b140.items = []builder{&b132, &b133, &b134, &b135, &b136, &b137, &b138, &b139}
+	var b145 = sequenceBuilder{id: 145, commit: 264, name: "root", allChars: true, ranges: [][]int{{1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}}, generalizations: []int{146}}
 	var b141 = charBuilder{}
-	b142.items = []builder{&b140, &b141}
-	var b147 = sequenceBuilder{id: 147, commit: 264, name: "nows", allChars: true, ranges: [][]int{{1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}}, generalizations: []int{170}}
+	var b142 = charBuilder{}
 	var b143 = charBuilder{}
 	var b144 = charBuilder{}
-	var b145 = charBuilder{}
-	var b146 = charBuilder{}
-	b147.items = []builder{&b143, &b144, &b145, &b146}
-	var b150 = sequenceBuilder{id: 150, commit: 264, name: "kw", allChars: true, ranges: [][]int{{1, 1}, {1, 1}, {1, 1}, {1, 1}}, generalizations: []int{170}}
-	var b148 = charBuilder{}
-	var b149 = charBuilder{}
-	b150.items = []builder{&b148, &b149}
-	var b155 = sequenceBuilder{id: 155, commit: 264, name: "nokw", allChars: true, ranges: [][]int{{1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}}, generalizations: []int{170}}
+	b145.items = []builder{&b141, &b142, &b143, &b144}
+	b146.options = []builder{&b115, &b118, &b123, &b126, &b131, &b140, &b145}
+	b149.items = []builder{&b148, &b146}
+	b150.items = []builder{&b68, &b149}
+	var b152 = sequenceBuilder{id: 152, commit: 10, allChars: true, ranges: [][]int{{1, 1}, {1, 1}}}
 	var b151 = charBuilder{}
-	var b152 = charBuilder{}
-	var b153 = charBuilder{}
-	var b154 = charBuilder{}
-	b155.items = []builder{&b151, &b152, &b153, &b154}
-	var b164 = sequenceBuilder{id: 164, commit: 264, name: "failpass", allChars: true, ranges: [][]int{{1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}}, generalizations: []int{170}}
-	var b156 = charBuilder{}
-	var b157 = charBuilder{}
-	var b158 = charBuilder{}
-	var b159 = charBuilder{}
-	var b160 = charBuilder{}
-	var b161 = charBuilder{}
-	var b162 = charBuilder{}
-	var b163 = charBuilder{}
-	b164.items = []builder{&b156, &b157, &b158, &b159, &b160, &b161, &b162, &b163}
-	var b169 = sequenceBuilder{id: 169, commit: 264, name: "root", allChars: true, ranges: [][]int{{1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}}, generalizations: []int{170}}
-	var b165 = charBuilder{}
-	var b166 = charBuilder{}
-	var b167 = charBuilder{}
-	var b168 = charBuilder{}
-	b169.items = []builder{&b165, &b166, &b167, &b168}
-	b170.options = []builder{&b139, &b142, &b147, &b150, &b155, &b164, &b169}
-	b173.items = []builder{&b172, &b170}
-	b174.items = []builder{&b92, &b173}
-	var b176 = sequenceBuilder{id: 176, commit: 10, allChars: true, ranges: [][]int{{1, 1}, {1, 1}}}
-	var b175 = charBuilder{}
-	b176.items = []builder{&b175}
-	var b98 = choiceBuilder{id: 98, commit: 258}
-	var b89 = choiceBuilder{id: 89, commit: 258, generalizations: []int{98, 124, 128}}
-	var b56 = sequenceBuilder{id: 56, commit: 264, name: "any-char", allChars: true, ranges: [][]int{{1, 1}, {1, 1}}, generalizations: []int{89, 98, 124, 128}}
-	var b55 = charBuilder{}
-	b56.items = []builder{&b55}
-	var b75 = sequenceBuilder{id: 75, commit: 264, name: "char-class", ranges: [][]int{{1, 1}, {0, 1}, {0, -1}, {1, 1}, {1, 1}, {0, 1}, {0, -1}, {1, 1}}, generalizations: []int{89, 98, 124, 128}}
-	var b71 = sequenceBuilder{id: 71, commit: 10, allChars: true, ranges: [][]int{{1, 1}, {1, 1}}}
-	var b70 = charBuilder{}
-	b71.items = []builder{&b70}
-	var b58 = sequenceBuilder{id: 58, commit: 264, name: "class-not", allChars: true, ranges: [][]int{{1, 1}, {1, 1}}}
-	var b57 = charBuilder{}
-	b58.items = []builder{&b57}
-	var b72 = choiceBuilder{id: 72, commit: 10}
-	var b66 = choiceBuilder{id: 66, commit: 264, name: "class-char", generalizations: []int{72}}
-	var b60 = sequenceBuilder{id: 60, commit: 10, allChars: true, ranges: [][]int{{1, 1}, {1, 1}}, generalizations: []int{66, 72}}
-	var b59 = charBuilder{}
-	b60.items = []builder{&b59}
-	var b65 = sequenceBuilder{id: 65, commit: 10, ranges: [][]int{{1, 1}, {1, 1}, {1, 1}, {1, 1}}, generalizations: []int{66, 72}}
-	var b62 = sequenceBuilder{id: 62, commit: 10, allChars: true, ranges: [][]int{{1, 1}, {1, 1}}}
-	var b61 = charBuilder{}
-	b62.items = []builder{&b61}
-	var b64 = sequenceBuilder{id: 64, commit: 10, allChars: true, ranges: [][]int{{1, 1}, {1, 1}}}
-	var b63 = charBuilder{}
-	b64.items = []builder{&b63}
-	b65.items = []builder{&b62, &b64}
-	b66.options = []builder{&b60, &b65}
-	var b69 = sequenceBuilder{id: 69, commit: 264, name: "char-range", ranges: [][]int{{1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}}, generalizations: []int{72}}
-	var b68 = sequenceBuilder{id: 68, commit: 10, allChars: true, ranges: [][]int{{1, 1}, {1, 1}}}
-	var b67 = charBuilder{}
-	b68.items = []builder{&b67}
-	b69.items = []builder{&b66, &b68, &b66}
-	b72.options = []builder{&b66, &b69}
-	var b74 = sequenceBuilder{id: 74, commit: 10, allChars: true, ranges: [][]int{{1, 1}, {1, 1}}}
-	var b73 = charBuilder{}
-	b74.items = []builder{&b73}
-	b75.items = []builder{&b71, &b58, &b72, &b74}
-	var b88 = sequenceBuilder{id: 88, commit: 264, name: "char-sequence", ranges: [][]int{{1, 1}, {0, -1}, {1, 1}, {1, 1}, {0, -1}, {1, 1}}, generalizations: []int{89, 98, 124, 128}}
-	var b85 = sequenceBuilder{id: 85, commit: 10, allChars: true, ranges: [][]int{{1, 1}, {1, 1}}}
-	var b84 = charBuilder{}
-	b85.items = []builder{&b84}
-	var b83 = choiceBuilder{id: 83, commit: 264, name: "sequence-char"}
-	var b77 = sequenceBuilder{id: 77, commit: 10, allChars: true, ranges: [][]int{{1, 1}, {1, 1}}, generalizations: []int{83}}
-	var b76 = charBuilder{}
+	b152.items = []builder{&b151}
+	var b74 = choiceBuilder{id: 74, commit: 258}
+	var b65 = choiceBuilder{id: 65, commit: 258, generalizations: []int{74, 100, 104}}
+	var b32 = sequenceBuilder{id: 32, commit: 264, name: "any-char", allChars: true, ranges: [][]int{{1, 1}, {1, 1}}, generalizations: []int{65, 74, 100, 104}}
+	var b31 = charBuilder{}
+	b32.items = []builder{&b31}
+	var b51 = sequenceBuilder{id: 51, commit: 264, name: "char-class", ranges: [][]int{{1, 1}, {0, 1}, {0, -1}, {1, 1}, {1, 1}, {0, 1}, {0, -1}, {1, 1}}, generalizations: []int{65, 74, 100, 104}}
+	var b47 = sequenceBuilder{id: 47, commit: 10, allChars: true, ranges: [][]int{{1, 1}, {1, 1}}}
+	var b46 = charBuilder{}
+	b47.items = []builder{&b46}
+	var b34 = sequenceBuilder{id: 34, commit: 264, name: "class-not", allChars: true, ranges: [][]int{{1, 1}, {1, 1}}}
+	var b33 = charBuilder{}
+	b34.items = []builder{&b33}
+	var b48 = choiceBuilder{id: 48, commit: 10}
+	var b42 = choiceBuilder{id: 42, commit: 264, name: "class-char", generalizations: []int{48}}
+	var b36 = sequenceBuilder{id: 36, commit: 10, allChars: true, ranges: [][]int{{1, 1}, {1, 1}}, generalizations: []int{42, 48}}
+	var b35 = charBuilder{}
+	b36.items = []builder{&b35}
+	var b41 = sequenceBuilder{id: 41, commit: 10, ranges: [][]int{{1, 1}, {1, 1}, {1, 1}, {1, 1}}, generalizations: []int{42, 48}}
+	var b38 = sequenceBuilder{id: 38, commit: 10, allChars: true, ranges: [][]int{{1, 1}, {1, 1}}}
+	var b37 = charBuilder{}
+	b38.items = []builder{&b37}
+	var b40 = sequenceBuilder{id: 40, commit: 10, allChars: true, ranges: [][]int{{1, 1}, {1, 1}}}
+	var b39 = charBuilder{}
+	b40.items = []builder{&b39}
+	b41.items = []builder{&b38, &b40}
+	b42.options = []builder{&b36, &b41}
+	var b45 = sequenceBuilder{id: 45, commit: 264, name: "char-range", ranges: [][]int{{1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}}, generalizations: []int{48}}
+	var b44 = sequenceBuilder{id: 44, commit: 10, allChars: true, ranges: [][]int{{1, 1}, {1, 1}}}
+	var b43 = charBuilder{}
+	b44.items = []builder{&b43}
+	b45.items = []builder{&b42, &b44, &b42}
+	b48.options = []builder{&b42, &b45}
+	var b50 = sequenceBuilder{id: 50, commit: 10, allChars: true, ranges: [][]int{{1, 1}, {1, 1}}}
+	var b49 = charBuilder{}
+	b50.items = []builder{&b49}
+	b51.items = []builder{&b47, &b34, &b48, &b50}
+	var b64 = sequenceBuilder{id: 64, commit: 264, name: "char-sequence", ranges: [][]int{{1, 1}, {0, -1}, {1, 1}, {1, 1}, {0, -1}, {1, 1}}, generalizations: []int{65, 74, 100, 104}}
+	var b61 = sequenceBuilder{id: 61, commit: 10, allChars: true, ranges: [][]int{{1, 1}, {1, 1}}}
+	var b60 = charBuilder{}
+	b61.items = []builder{&b60}
+	var b59 = choiceBuilder{id: 59, commit: 264, name: "sequence-char"}
+	var b53 = sequenceBuilder{id: 53, commit: 10, allChars: true, ranges: [][]int{{1, 1}, {1, 1}}, generalizations: []int{59}}
+	var b52 = charBuilder{}
+	b53.items = []builder{&b52}
+	var b58 = sequenceBuilder{id: 58, commit: 10, ranges: [][]int{{1, 1}, {1, 1}, {1, 1}, {1, 1}}, generalizations: []int{59}}
+	var b55 = sequenceBuilder{id: 55, commit: 10, allChars: true, ranges: [][]int{{1, 1}, {1, 1}}}
+	var b54 = charBuilder{}
+	b55.items = []builder{&b54}
+	var b57 = sequenceBuilder{id: 57, commit: 10, allChars: true, ranges: [][]int{{1, 1}, {1, 1}}}
+	var b56 = charBuilder{}
+	b57.items = []builder{&b56}
+	b58.items = []builder{&b55, &b57}
+	b59.options = []builder{&b53, &b58}
+	var b63 = sequenceBuilder{id: 63, commit: 10, allChars: true, ranges: [][]int{{1, 1}, {1, 1}}}
+	var b62 = charBuilder{}
+	b63.items = []builder{&b62}
+	b64.items = []builder{&b61, &b59, &b63}
+	b65.options = []builder{&b32, &b51, &b64}
+	var b73 = sequenceBuilder{id: 73, commit: 258, ranges: [][]int{{1, 1}, {0, -1}, {1, 1}, {0, -1}, {1, 1}}, generalizations: []int{74, 100, 104}}
+	var b70 = sequenceBuilder{id: 70, commit: 10, allChars: true, ranges: [][]int{{1, 1}, {1, 1}}}
+	var b69 = charBuilder{}
+	b70.items = []builder{&b69}
+	var b72 = sequenceBuilder{id: 72, commit: 10, allChars: true, ranges: [][]int{{1, 1}, {1, 1}}}
+	var b71 = charBuilder{}
+	b72.items = []builder{&b71}
+	b73.items = []builder{&b70, &b170, &b74, &b170, &b72}
+	var b103 = sequenceBuilder{id: 103, commit: 256, name: "sequence", ranges: [][]int{{1, 1}, {0, -1}}, generalizations: []int{74, 104}}
+	var b101 = sequenceBuilder{id: 101, commit: 264, name: "item", ranges: [][]int{{1, 1}, {0, 1}, {1, 1}, {0, 1}}}
+	var b100 = choiceBuilder{id: 100, commit: 10}
+	b100.options = []builder{&b65, &b68, &b73}
+	var b99 = choiceBuilder{id: 99, commit: 258}
+	var b83 = sequenceBuilder{id: 83, commit: 256, name: "count-quantifier", ranges: [][]int{{1, 1}, {0, -1}, {1, 1}, {0, -1}, {1, 1}}, generalizations: []int{99}}
+	var b80 = sequenceBuilder{id: 80, commit: 10, allChars: true, ranges: [][]int{{1, 1}, {1, 1}}}
+	var b79 = charBuilder{}
+	b80.items = []builder{&b79}
+	var b78 = sequenceBuilder{id: 78, commit: 256, name: "count", ranges: [][]int{{1, 1}}}
+	var b77 = sequenceBuilder{id: 77, commit: 266, ranges: [][]int{{1, -1}, {1, -1}}}
+	var b76 = sequenceBuilder{id: 76, commit: 10, allChars: true, ranges: [][]int{{1, 1}, {1, 1}}}
+	var b75 = charBuilder{}
+	b76.items = []builder{&b75}
 	b77.items = []builder{&b76}
-	var b82 = sequenceBuilder{id: 82, commit: 10, ranges: [][]int{{1, 1}, {1, 1}, {1, 1}, {1, 1}}, generalizations: []int{83}}
-	var b79 = sequenceBuilder{id: 79, commit: 10, allChars: true, ranges: [][]int{{1, 1}, {1, 1}}}
-	var b78 = charBuilder{}
-	b79.items = []builder{&b78}
-	var b81 = sequenceBuilder{id: 81, commit: 10, allChars: true, ranges: [][]int{{1, 1}, {1, 1}}}
-	var b80 = charBuilder{}
-	b81.items = []builder{&b80}
-	b82.items = []builder{&b79, &b81}
-	b83.options = []builder{&b77, &b82}
+	b78.items = []builder{&b77}
+	var b82 = sequenceBuilder{id: 82, commit: 10, allChars: true, ranges: [][]int{{1, 1}, {1, 1}}}
+	var b81 = charBuilder{}
+	b82.items = []builder{&b81}
+	b83.items = []builder{&b80, &b170, &b78, &b170, &b82}
+	var b92 = sequenceBuilder{id: 92, commit: 256, name: "range-quantifier", ranges: [][]int{{1, 1}, {0, -1}, {0, 1}, {0, -1}, {1, 1}, {0, -1}, {0, 1}, {0, -1}, {1, 1}}, generalizations: []int{99}}
 	var b87 = sequenceBuilder{id: 87, commit: 10, allChars: true, ranges: [][]int{{1, 1}, {1, 1}}}
 	var b86 = charBuilder{}
 	b87.items = []builder{&b86}
-	b88.items = []builder{&b85, &b83, &b87}
-	b89.options = []builder{&b56, &b75, &b88}
-	var b97 = sequenceBuilder{id: 97, commit: 258, ranges: [][]int{{1, 1}, {0, -1}, {1, 1}, {0, -1}, {1, 1}}, generalizations: []int{98, 124, 128}}
-	var b94 = sequenceBuilder{id: 94, commit: 10, allChars: true, ranges: [][]int{{1, 1}, {1, 1}}}
+	var b84 = sequenceBuilder{id: 84, commit: 256, name: "range-from", ranges: [][]int{{1, 1}}}
+	b84.items = []builder{&b77}
+	var b89 = sequenceBuilder{id: 89, commit: 10, allChars: true, ranges: [][]int{{1, 1}, {1, 1}}}
+	var b88 = charBuilder{}
+	b89.items = []builder{&b88}
+	var b85 = sequenceBuilder{id: 85, commit: 256, name: "range-to", ranges: [][]int{{1, 1}}}
+	b85.items = []builder{&b77}
+	var b91 = sequenceBuilder{id: 91, commit: 10, allChars: true, ranges: [][]int{{1, 1}, {1, 1}}}
+	var b90 = charBuilder{}
+	b91.items = []builder{&b90}
+	b92.items = []builder{&b87, &b170, &b84, &b170, &b89, &b170, &b85, &b170, &b91}
+	var b94 = sequenceBuilder{id: 94, commit: 264, name: "one-or-more", allChars: true, ranges: [][]int{{1, 1}, {1, 1}}, generalizations: []int{99}}
 	var b93 = charBuilder{}
 	b94.items = []builder{&b93}
-	var b96 = sequenceBuilder{id: 96, commit: 10, allChars: true, ranges: [][]int{{1, 1}, {1, 1}}}
+	var b96 = sequenceBuilder{id: 96, commit: 264, name: "zero-or-more", allChars: true, ranges: [][]int{{1, 1}, {1, 1}}, generalizations: []int{99}}
 	var b95 = charBuilder{}
 	b96.items = []builder{&b95}
-	b97.items = []builder{&b94, &b194, &b98, &b194, &b96}
-	var b127 = sequenceBuilder{id: 127, commit: 256, name: "sequence", ranges: [][]int{{1, 1}, {0, -1}}, generalizations: []int{98, 128}}
-	var b125 = sequenceBuilder{id: 125, commit: 264, name: "item", ranges: [][]int{{1, 1}, {0, 1}, {1, 1}, {0, 1}}}
-	var b124 = choiceBuilder{id: 124, commit: 10}
-	b124.options = []builder{&b89, &b92, &b97}
-	var b123 = choiceBuilder{id: 123, commit: 258}
-	var b107 = sequenceBuilder{id: 107, commit: 256, name: "count-quantifier", ranges: [][]int{{1, 1}, {0, -1}, {1, 1}, {0, -1}, {1, 1}}, generalizations: []int{123}}
-	var b104 = sequenceBuilder{id: 104, commit: 10, allChars: true, ranges: [][]int{{1, 1}, {1, 1}}}
-	var b103 = charBuilder{}
-	b104.items = []builder{&b103}
-	var b102 = sequenceBuilder{id: 102, commit: 256, name: "count", ranges: [][]int{{1, 1}}}
-	var b101 = sequenceBuilder{id: 101, commit: 266, ranges: [][]int{{1, -1}, {1, -1}}}
-	var b100 = sequenceBuilder{id: 100, commit: 10, allChars: true, ranges: [][]int{{1, 1}, {1, 1}}}
-	var b99 = charBuilder{}
-	b100.items = []builder{&b99}
-	b101.items = []builder{&b100}
-	b102.items = []builder{&b101}
+	var b98 = sequenceBuilder{id: 98, commit: 264, name: "zero-or-one", allChars: true, ranges: [][]int{{1, 1}, {1, 1}}, generalizations: []int{99}}
+	var b97 = charBuilder{}
+	b98.items = []builder{&b97}
+	b99.options = []builder{&b83, &b92, &b94, &b96, &b98}
+	b101.items = []builder{&b100, &b99}
+	var b102 = sequenceBuilder{id: 102, commit: 2, ranges: [][]int{{0, -1}, {1, 1}}}
+	b102.items = []builder{&b170, &b101}
+	b103.items = []builder{&b101, &b102}
+	var b109 = sequenceBuilder{id: 109, commit: 256, name: "choice", ranges: [][]int{{1, 1}, {0, -1}, {1, 1}, {0, -1}}, generalizations: []int{74}}
+	var b104 = choiceBuilder{id: 104, commit: 258}
+	b104.options = []builder{&b65, &b68, &b73, &b103}
+	var b107 = sequenceBuilder{id: 107, commit: 2, ranges: [][]int{{1, 1}, {0, -1}, {1, 1}}}
 	var b106 = sequenceBuilder{id: 106, commit: 10, allChars: true, ranges: [][]int{{1, 1}, {1, 1}}}
 	var b105 = charBuilder{}
 	b106.items = []builder{&b105}
-	b107.items = []builder{&b104, &b194, &b102, &b194, &b106}
-	var b116 = sequenceBuilder{id: 116, commit: 256, name: "range-quantifier", ranges: [][]int{{1, 1}, {0, -1}, {0, 1}, {0, -1}, {1, 1}, {0, -1}, {0, 1}, {0, -1}, {1, 1}}, generalizations: []int{123}}
-	var b111 = sequenceBuilder{id: 111, commit: 10, allChars: true, ranges: [][]int{{1, 1}, {1, 1}}}
-	var b110 = charBuilder{}
-	b111.items = []builder{&b110}
-	var b108 = sequenceBuilder{id: 108, commit: 256, name: "range-from", ranges: [][]int{{1, 1}}}
-	b108.items = []builder{&b101}
-	var b113 = sequenceBuilder{id: 113, commit: 10, allChars: true, ranges: [][]int{{1, 1}, {1, 1}}}
-	var b112 = charBuilder{}
-	b113.items = []builder{&b112}
-	var b109 = sequenceBuilder{id: 109, commit: 256, name: "range-to", ranges: [][]int{{1, 1}}}
-	b109.items = []builder{&b101}
-	var b115 = sequenceBuilder{id: 115, commit: 10, allChars: true, ranges: [][]int{{1, 1}, {1, 1}}}
-	var b114 = charBuilder{}
-	b115.items = []builder{&b114}
-	b116.items = []builder{&b111, &b194, &b108, &b194, &b113, &b194, &b109, &b194, &b115}
-	var b118 = sequenceBuilder{id: 118, commit: 264, name: "one-or-more", allChars: true, ranges: [][]int{{1, 1}, {1, 1}}, generalizations: []int{123}}
-	var b117 = charBuilder{}
-	b118.items = []builder{&b117}
-	var b120 = sequenceBuilder{id: 120, commit: 264, name: "zero-or-more", allChars: true, ranges: [][]int{{1, 1}, {1, 1}}, generalizations: []int{123}}
-	var b119 = charBuilder{}
-	b120.items = []builder{&b119}
-	var b122 = sequenceBuilder{id: 122, commit: 264, name: "zero-or-one", allChars: true, ranges: [][]int{{1, 1}, {1, 1}}, generalizations: []int{123}}
-	var b121 = charBuilder{}
-	b122.items = []builder{&b121}
-	b123.options = []builder{&b107, &b116, &b118, &b120, &b122}
-	b125.items = []builder{&b124, &b123}
-	var b126 = sequenceBuilder{id: 126, commit: 2, ranges: [][]int{{0, -1}, {1, 1}}}
-	b126.items = []builder{&b194, &b125}
-	b127.items = []builder{&b125, &b126}
-	var b133 = sequenceBuilder{id: 133, commit: 256, name: "choice", ranges: [][]int{{1, 1}, {0, -1}, {1, 1}, {0, -1}}, generalizations: []int{98}}
-	var b128 = choiceBuilder{id: 128, commit: 258}
-	b128.options = []builder{&b89, &b92, &b97, &b127}
-	var b131 = sequenceBuilder{id: 131, commit: 2, ranges: [][]int{{1, 1}, {0, -1}, {1, 1}}}
-	var b130 = sequenceBuilder{id: 130, commit: 10, allChars: true, ranges: [][]int{{1, 1}, {1, 1}}}
-	var b129 = charBuilder{}
-	b130.items = []builder{&b129}
-	b131.items = []builder{&b130, &b194, &b128}
-	var b132 = sequenceBuilder{id: 132, commit: 2, ranges: [][]int{{0, -1}, {1, 1}}}
-	b132.items = []builder{&b194, &b131}
-	b133.items = []builder{&b128, &b194, &b131, &b132}
-	b98.options = []builder{&b89, &b92, &b97, &b127, &b133}
-	b177.items = []builder{&b174, &b194, &b176, &b194, &b98}
-	var b183 = sequenceBuilder{id: 183, commit: 2, ranges: [][]int{{0, -1}, {1, 1}, {0, -1}}}
-	var b181 = sequenceBuilder{id: 181, commit: 2, ranges: [][]int{{1, 1}, {0, -1}, {0, -1}, {1, 1}}}
-	var b179 = sequenceBuilder{id: 179, commit: 10, allChars: true, ranges: [][]int{{1, 1}, {1, 1}}}
-	var b178 = charBuilder{}
-	b179.items = []builder{&b178}
-	var b180 = sequenceBuilder{id: 180, commit: 2, ranges: [][]int{{0, -1}, {1, 1}}}
-	b180.items = []builder{&b194, &b179}
-	b181.items = []builder{&b179, &b180, &b194, &b177}
-	var b182 = sequenceBuilder{id: 182, commit: 2, ranges: [][]int{{0, -1}, {1, 1}}}
-	b182.items = []builder{&b194, &b181}
-	b183.items = []builder{&b194, &b181, &b182}
-	b184.items = []builder{&b177, &b183}
-	var b192 = sequenceBuilder{id: 192, commit: 2, ranges: [][]int{{0, -1}, {1, 1}, {0, -1}}}
-	var b188 = sequenceBuilder{id: 188, commit: 10, allChars: true, ranges: [][]int{{1, 1}, {1, 1}}}
-	var b187 = charBuilder{}
-	b188.items = []builder{&b187}
-	var b191 = sequenceBuilder{id: 191, commit: 2, ranges: [][]int{{0, -1}, {1, 1}}}
-	b191.items = []builder{&b194, &b188}
-	b192.items = []builder{&b194, &b188, &b191}
-	b195.items = []builder{&b190, &b194, &b184, &b192}
-	b196.items = []builder{&b194, &b195, &b194}
+	b107.items = []builder{&b106, &b170, &b104}
+	var b108 = sequenceBuilder{id: 108, commit: 2, ranges: [][]int{{0, -1}, {1, 1}}}
+	b108.items = []builder{&b170, &b107}
+	b109.items = []builder{&b104, &b170, &b107, &b108}
+	b74.options = []builder{&b65, &b68, &b73, &b103, &b109}
+	b153.items = []builder{&b150, &b170, &b152, &b170, &b74}
+	var b159 = sequenceBuilder{id: 159, commit: 2, ranges: [][]int{{0, -1}, {1, 1}, {0, -1}}}
+	var b157 = sequenceBuilder{id: 157, commit: 2, ranges: [][]int{{1, 1}, {0, -1}, {0, -1}, {1, 1}}}
+	var b155 = sequenceBuilder{id: 155, commit: 10, allChars: true, ranges: [][]int{{1, 1}, {1, 1}}}
+	var b154 = charBuilder{}
+	b155.items = []builder{&b154}
+	var b156 = sequenceBuilder{id: 156, commit: 2, ranges: [][]int{{0, -1}, {1, 1}}}
+	b156.items = []builder{&b170, &b155}
+	b157.items = []builder{&b155, &b156, &b170, &b153}
+	var b158 = sequenceBuilder{id: 158, commit: 2, ranges: [][]int{{0, -1}, {1, 1}}}
+	b158.items = []builder{&b170, &b157}
+	b159.items = []builder{&b170, &b157, &b158}
+	b160.items = []builder{&b153, &b159}
+	var b168 = sequenceBuilder{id: 168, commit: 2, ranges: [][]int{{0, -1}, {1, 1}, {0, -1}}}
+	var b164 = sequenceBuilder{id: 164, commit: 10, allChars: true, ranges: [][]int{{1, 1}, {1, 1}}}
+	var b163 = charBuilder{}
+	b164.items = []builder{&b163}
+	var b167 = sequenceBuilder{id: 167, commit: 2, ranges: [][]int{{0, -1}, {1, 1}}}
+	b167.items = []builder{&b170, &b164}
+	b168.items = []builder{&b170, &b164, &b167}
+	b171.items = []builder{&b166, &b170, &b160, &b168}
+	b172.items = []builder{&b170, &b171, &b170}
 
 	var keywords = []parser{}
 
-	return parseInput(r, &p196, &b196, keywords)
+	return parseInput(r, &p172, &b172, keywords)
 }
diff --git a/syntax.treerack b/syntax.treerack
index 686aae5..ae0d7da 100644
--- a/syntax.treerack
+++ b/syntax.treerack
@@ -1,7 +1,9 @@
+// Treerack syntax (self)
+
 // whitespace handling:
-wschar:alias        = " " | "\t" | "\n" | "\b" | "\f" | "\r" | "\v";
+wschar:alias        = [ \t\n\b\f\r\v];
 wsc:ws              = wschar | comment;
-ws-no-nl:alias:nows = " " | "\t" | "\b" | "\f" | "\r" | "\v";
+ws-no-nl:alias:nows = [ \t\b\f\r\v]; // whitespace without newline
 
 // comments:
 block-comment:alias:nows   = "/*" ("*" [^/] | [^*])* "*/";