 				2:  {name: "keyword.control.roff"}
 				3:  {name: "keyword.operator.logical"}
 				4:  {name: "constant.language.builtin-comparison.$4.roff"}
-				5:  {name: "meta.equation.roff"}
-				6:  {name: "punctuation.definition.begin.roff"}
-				7:  {patterns: [{include: "#arithmetic"}]}
-				8:  {name: "punctuation.definition.end.roff"}
+				5:  {name: "constant.language.builtin-comparison.$5.gnu.roff"}
+				6:  {patterns: [include: "#escapes"]}
+				7:  {name: "meta.equation.roff"}
+				8:  {name: "punctuation.definition.begin.roff"}
 				9:  {patterns: [{include: "#arithmetic"}]}
-				10: {patterns: [{include: "#escapes"}]}
+				10: {name: "punctuation.definition.end.roff"}
 				11: {patterns: [{include: "#arithmetic"}]}
-				12: {name: "punctuation.definition.begin.roff"}
+				12: {patterns: [{include: "#escapes"}]}
 				13: {patterns: [{include: "#arithmetic"}]}
-				14: {name: "punctuation.definition.end.roff"}
-				15: {name: "punctuation.definition.string.begin.roff"}
-				16: {name: "variable.parameter.operand.left.roff"}
-				17: {patterns: [{include: "#escapes"}]}
-				18: {name: "punctuation.definition.string.roff"}
-				19: {name: "variable.parameter.operand.right.roff"}
-				20: {patterns: [{include: "#escapes"}]}
-				21: {name: "punctuation.definition.string.end.roff"}
-				22: {name: "meta.operand.single.roff"}
-				23: {patterns: [{include: "#conditional-innards"}]}
+				14: {name: "punctuation.definition.begin.roff"}
+				15: {patterns: [{include: "#arithmetic"}]}
+				16: {name: "punctuation.definition.end.roff"}
+				17: {name: "punctuation.definition.string.begin.roff"}
+				18: {name: "variable.parameter.operand.left.roff"}
+				19: {patterns: [{include: "#escapes"}]}
+				20: {name: "punctuation.definition.string.roff"}
+				21: {name: "variable.parameter.operand.right.roff"}
+				22: {patterns: [{include: "#escapes"}]}
+				23: {name: "punctuation.definition.string.end.roff"}
+				24: {name: "meta.operand.single.roff"}
+				25: {patterns: [{include: "#conditional-innards"}]}
 		},{
 			
 			# Conditional: Else

				
				(?:
					# One-character built-in comparison name
					([note])         # 4: constant.language.comparison-name.builtin.$4.roff
					
					|
					
					# Arithmetic
					(                # 5: meta.equation.roff
						
						# Starts with a bracket
						(\\()        # 6: punctuation.definition.begin.roff
						(.*?)        # 7: Include “#arithmetic”
						(\\))        # 8: punctuation.definition.end.roff
						
						# Anything else affixed to it
						(            # 9: Include “#arithmetic”
							(?:
								[^\\s\\(] | # Operators/numbers
								\\(.*?\\)   # More brackets

					|
					
					# String/variable comparison
					([^\\d\\s\\\\])  # 17: punctuation.definition.string.begin.roff
					(                # 18: variable.parameter.operand.left.roff
						(.*?)        # 19: Include “#escapes”
					)
					(\\17)           # 20: punctuation.definition.string.roff
					(                # 21: variable.parameter.operand.right.roff
						(.*?)        # 22: Include “#escapes”
					)
					(\\17)           # 23: punctuation.definition.string.end.roff
					
					|
					
					# Anything not recognised
					(\\S)            # 24: meta.operand.single.roff
				)?
				
				(.*)                 # 25: Include “#conditional-innards”
			"""
			end: "$"
			beginCaptures:
