diff --git a/css-values-5/Overview.bs b/css-values-5/Overview.bs
index c203714ee57f..e181e928489a 100644
--- a/css-values-5/Overview.bs
+++ b/css-values-5/Overview.bs
@@ -987,7 +987,7 @@ Interpolation Mapping Notations: the *-interpolate() family</h2>
 	The [=functional notations=] follow the syntactic pattern:
 
 	<pre class=prod>
-		<var>*interpolate</var>() = <var>*interpolate</var>( <var>progress</var> && <var>global-options</var>?,
+		<var>*interpolate</var>() = <var>*interpolate</var>( [ <var>progress</var> && <var>global-options</var>? ],
 		                               <var>stop</var>, [  <var>between-options</var>? , <var>stop</var> ]# )
 	</pre>
 
@@ -1027,10 +1027,12 @@ Global Syntax of the *-interpolate() family</h3>
 
 	<pre class=prod>
 		<var>interpolate-function</var>() = <var>interpolate-function</var>(
-			<<progress-source>> && [ by <<easing-function>> ]?
-			&& <<easing-function>>? && <<segment-options>>?,
+			[
+				<<progress-source>> && [ by <<easing-function>> ]?
+				&& <<easing-function>>? && <<segment-options>>?
+			] ,
 			<<input-position>>{1,2} : <<output-value>> ,
-			[ [ <<easing-function>> || <<segment-options>> , ]? <<input-position>>{1,2} : <<output-value>> ]*
+			[ [ <<easing-function>> || <<segment-options>> ]? , <<input-position>>{1,2} : <<output-value>> ]#?
 		)
 	</pre>
 
@@ -1263,8 +1265,10 @@ Interpolated Numeric and Dimensional Values: the ''calc-interpolate()'' notation
 
 	<pre class=prod>
 		<<calc-interpolate()>> = calc-interpolate(
-			<<progress-source>> && [ by <<easing-function>> ]?
-			&& <<easing-function>>?,
+			[
+				<<progress-source>> && [ by <<easing-function>> ]?
+				&& <<easing-function>>?
+			] ,
 			<<input-position>>{1,2} : <<calc-sum>> ,
 			[ <<easing-function>>? , <<input-position>>{1,2} : <<calc-sum>> ]# )
 	</pre>
@@ -1274,7 +1278,7 @@ Interpolated Numeric and Dimensional Values: the ''calc-interpolate()'' notation
 	but must have a [=consistent type=]
 	or else the function is invalid.
 	The result's type will be the [=consistent type=],
-	[=made consistent=] with the type of the <<progress>> value.
+	[=made consistent=] with the type of the <<progress-source>> value.
 
 <h3 id="color-interpolate">
 Interpolated Color Values: the ''color-interpolate()'' notation</h3>
@@ -1285,8 +1289,10 @@ Interpolated Color Values: the ''color-interpolate()'' notation</h3>
 
 	<pre class=prod>
 		<<color-interpolate()>> = color-interpolate(
-			<<progress-source>> && [ by <<easing-function>> ]?
-			&& <<easing-function>>? && <<color-interpolation-method>>?,
+			[
+				<<progress-source>> && [ by <<easing-function>> ]?
+				&& <<easing-function>>? && <<color-interpolation-method>>?
+			] ,
 			<<input-position>>{1,2} : <<color>>,
 			[ [ <<easing-function>> || <<color-interpolation-method>> ],
 			  <<input-position>>{1,2} : <<color>> ]# )
@@ -1301,8 +1307,10 @@ Interpolated Transform Values: the ''transform-interpolate()'' notation</h3>
 
 	<pre class=prod>
 		<<transform-interpolate()>> = transform-interpolate(
-			<<progress-source>> && [ by <<easing-function>> ]?
-			&& <<easing-function>>?,
+			[
+				<<progress-source>> && [ by <<easing-function>> ]?
+				&& <<easing-function>>?
+			],
 			<<input-position>>{1,2} : <<transform-list>>,
 			[ <<easing-function>>?, <<input-position>>{1,2} : <<transform-list>> ]# )
 	</pre>
@@ -1318,8 +1326,10 @@ Interpolated Property Values: the ''interpolate()'' notation</h3>
 
 	<pre class=prod>
 		<<interpolate()>> = interpolate(
-			<<progress-source>> && [ by <<easing-function>> ]?
-			&& <<easing-function>>?,
+			[
+				<<progress-source>> && [ by <<easing-function>> ]?
+				&& <<easing-function>>?
+			] ,
 			<<input-position>>{1,2} : <<whole-value>>,
 			[ <<easing-function>>?, <<input-position>>{1,2} : <<whole-value>> ]# ) |
 		interpolate( <<progress-source>> && [ by <<easing-function>> ]?