diff --git a/grammars/webassembly.cson b/grammars/webassembly.cson
index 8de4a0d..7b34fb2 100644
--- a/grammars/webassembly.cson
+++ b/grammars/webassembly.cson
@@ -33,18 +33,10 @@ repository:
 			{include: "#number"}
 			{include: "#name"}
 			{include: "#string"}
-			{include: "#assignment"}
+			{include: "#optional-immediate"}
 		]
 
 
-	# Assignment (e.g.: offset=0 align=4)
-	assignment:
-		match: "(?<!\\w)(align|offset)(=)(?=[-+]?(?:\\d|0x[\\dA-Fa-f]))"
-		captures:
-			1: name: "variable.parameter.$1.webassembly"
-			2: name: "keyword.operator.assignment.webassembly"
-
-
 	# ;; Single-line comment
 	"comment-line":
 		name: "comment.line.semicolon.webassembly"
@@ -215,6 +207,14 @@ repository:
 			match: "(?<!\\w)[-+]?\\d+"
 		}]
 
+
+	# Optional immediate following load/store operators (e.g.: offset=0 align=4)
+	"optional-immediate":
+		match: "(?<!\\w)(align|offset)(=)(?=[-+]?(?:\\d|0x[\\dA-Fa-f]))"
+		captures:
+			1: name: "variable.parameter.$1.webassembly"
+			2: name: "keyword.operator.assignment.webassembly"
+
 	
 	# Quoted string
 	string: