diff --git a/spec/libsass-closed-issues/issue_1793.hrx b/spec/libsass-closed-issues/issue_1793.hrx
index fdfbb80d1..85debd0ba 100644
--- a/spec/libsass-closed-issues/issue_1793.hrx
+++ b/spec/libsass-closed-issues/issue_1793.hrx
@@ -4,7 +4,7 @@
 }
 
 <===> error
-Error: 10px*in isn't a valid CSS value.
+Error: calc(10px * 1in) isn't a valid CSS value.
   ,
 1 | @media (max-width: (2px*5in)) {
   |                    ^^^^^^^^^
diff --git a/spec/libsass-closed-issues/issue_1804/inline.hrx b/spec/libsass-closed-issues/issue_1804/inline.hrx
index faefdbda4..6e5fa5270 100644
--- a/spec/libsass-closed-issues/issue_1804/inline.hrx
+++ b/spec/libsass-closed-issues/issue_1804/inline.hrx
@@ -4,7 +4,7 @@ foo {
 }
 
 <===> error
-Error: 10px*in isn't a valid CSS value.
+Error: calc(10px * 1in) isn't a valid CSS value.
   ,
 2 |   bar: #{(2px*5in)};
   |          ^^^^^^^^^
diff --git a/spec/libsass-closed-issues/issue_1804/variable.hrx b/spec/libsass-closed-issues/issue_1804/variable.hrx
index b5ae95fcc..aded02337 100644
--- a/spec/libsass-closed-issues/issue_1804/variable.hrx
+++ b/spec/libsass-closed-issues/issue_1804/variable.hrx
@@ -7,7 +7,7 @@ foo {
 }
 
 <===> error
-Error: 10px*in isn't a valid CSS value.
+Error: calc(10px * 1in) isn't a valid CSS value.
   ,
 5 |   bar: #{($foo*$bar)};
   |          ^^^^^^^^^^^
diff --git a/spec/non_conformant/errors/invalid-operation/sub.hrx b/spec/non_conformant/errors/invalid-operation/sub.hrx
index acd8fd797..e5e707f99 100644
--- a/spec/non_conformant/errors/invalid-operation/sub.hrx
+++ b/spec/non_conformant/errors/invalid-operation/sub.hrx
@@ -3,7 +3,7 @@ test {
   err: 2px - 2px*2px;
 }
 <===> error
-Error: 2px and 4px*px have incompatible units.
+Error: 2px and calc(4px * 1px) have incompatible units.
   ,
 2 |   err: 2px - 2px*2px;
   |        ^^^^^^^^^^^^^
diff --git a/spec/values/calculation/acos.hrx b/spec/values/calculation/acos.hrx
index 940d82d84..832411779 100644
--- a/spec/values/calculation/acos.hrx
+++ b/spec/values/calculation/acos.hrx
@@ -117,7 +117,7 @@ Error: Expected 1px to have no units.
 a {b: acos(-7px / 4em)}
 
 <===> error/unit/complex/error
-Error: Expected -1.75px/em to have no units.
+Error: Expected calc(-1.75px / 1em) to have no units.
   ,
 1 | a {b: acos(-7px / 4em)}
   |       ^^^^^^^^^^^^^^^^
diff --git a/spec/values/calculation/asin.hrx b/spec/values/calculation/asin.hrx
index 6d1b6b4fb..1ffdf33fd 100644
--- a/spec/values/calculation/asin.hrx
+++ b/spec/values/calculation/asin.hrx
@@ -117,7 +117,7 @@ Error: Expected 1px to have no units.
 a {b: asin(-7px / 4em)}
 
 <===> error/unit/complex/error
-Error: Expected -1.75px/em to have no units.
+Error: Expected calc(-1.75px / 1em) to have no units.
   ,
 1 | a {b: asin(-7px / 4em)}
   |       ^^^^^^^^^^^^^^^^
diff --git a/spec/values/calculation/atan.hrx b/spec/values/calculation/atan.hrx
index 05758f8d3..feddc873b 100644
--- a/spec/values/calculation/atan.hrx
+++ b/spec/values/calculation/atan.hrx
@@ -107,7 +107,7 @@ Error: Expected 1px to have no units.
 a {b: atan(-7px / 4em)}
 
 <===> error/unit/complex/error
-Error: Expected -1.75px/em to have no units.
+Error: Expected calc(-1.75px / 1em) to have no units.
   ,
 1 | a {b: atan(-7px / 4em)}
   |       ^^^^^^^^^^^^^^^^
diff --git a/spec/values/calculation/atan2.hrx b/spec/values/calculation/atan2.hrx
index 8c96664cc..332c8b1e5 100644
--- a/spec/values/calculation/atan2.hrx
+++ b/spec/values/calculation/atan2.hrx
@@ -147,7 +147,7 @@ Error: 1deg and 1px are incompatible.
 a {b: atan2(1px*2px, 10%)}
 
 <===> error/units/complex_and_unknown/error
-Error: Number 2px*px isn't compatible with CSS calculations.
+Error: Number calc(2px * 1px) isn't compatible with CSS calculations.
   ,
 1 | a {b: atan2(1px*2px, 10%)}
   |             ^^^^^^^
diff --git a/spec/values/calculation/calc/error/complex_units.hrx b/spec/values/calculation/calc/error/complex_units.hrx
index 588443238..bc4ca9008 100644
--- a/spec/values/calculation/calc/error/complex_units.hrx
+++ b/spec/values/calculation/calc/error/complex_units.hrx
@@ -2,7 +2,7 @@
 a {b: calc(1% + 1px * 2px)}
 
 <===> multiple_numerator/within_calc/error
-Error: Number 2px*px isn't compatible with CSS calculations.
+Error: Number calc(2px * 1px) isn't compatible with CSS calculations.
   ,
 1 | a {b: calc(1% + 1px * 2px)}
   |            ^^^^^^^^^^^^^^
@@ -16,7 +16,7 @@ $a: 1px * 2px;
 b {c: calc(1% + $a)}
 
 <===> multiple_numerator/from_variable/error
-Error: Number 2px*px isn't compatible with CSS calculations.
+Error: Number calc(2px * 1px) isn't compatible with CSS calculations.
   ,
 2 | b {c: calc(1% + $a)}
   |            ^^^^^^^
@@ -29,7 +29,7 @@ Error: Number 2px*px isn't compatible with CSS calculations.
 a {b: calc(1% + 1 / 2px)}
 
 <===> denominator/within_calc/error
-Error: Number 0.5px^-1 isn't compatible with CSS calculations.
+Error: Number calc(0.5 / 1px) isn't compatible with CSS calculations.
   ,
 1 | a {b: calc(1% + 1 / 2px)}
   |            ^^^^^^^^^^^^
@@ -44,7 +44,7 @@ $a: math.div(1, 2px);
 b {c: calc(1% + $a)}
 
 <===> denominator/from_variable/error
-Error: Number 0.5px^-1 isn't compatible with CSS calculations.
+Error: Number calc(0.5 / 1px) isn't compatible with CSS calculations.
   ,
 3 | b {c: calc(1% + $a)}
   |            ^^^^^^^
@@ -57,7 +57,7 @@ Error: Number 0.5px^-1 isn't compatible with CSS calculations.
 a {b: calc(1% + 1s / 2px)}
 
 <===> numerator_and_denominator/within_calc/error
-Error: Number 0.5s/px isn't compatible with CSS calculations.
+Error: Number calc(0.5s / 1px) isn't compatible with CSS calculations.
   ,
 1 | a {b: calc(1% + 1s / 2px)}
   |            ^^^^^^^^^^^^^
@@ -72,7 +72,7 @@ $a: math.div(1s, 2px);
 b {c: calc(1% + $a)}
 
 <===> numerator_and_denominator/from_variable/error
-Error: Number 0.5s/px isn't compatible with CSS calculations.
+Error: Number calc(0.5s / 1px) isn't compatible with CSS calculations.
   ,
 3 | b {c: calc(1% + $a)}
   |            ^^^^^^^
diff --git a/spec/values/calculation/calc/error/known_incompatible/complex.hrx b/spec/values/calculation/calc/error/known_incompatible/complex.hrx
index 3a6b0fabe..eade3d04f 100644
--- a/spec/values/calculation/calc/error/known_incompatible/complex.hrx
+++ b/spec/values/calculation/calc/error/known_incompatible/complex.hrx
@@ -15,7 +15,7 @@ Error: 1 and 1px are incompatible.
 a {b: calc(1 + 1/1px)}
 
 <===> unitless/and_denominator/error
-Error: Number 1px^-1 isn't compatible with CSS calculations.
+Error: Number calc(1 / 1px) isn't compatible with CSS calculations.
   ,
 1 | a {b: calc(1 + 1/1px)}
   |            ^^^^^^^^^
@@ -28,7 +28,7 @@ Error: Number 1px^-1 isn't compatible with CSS calculations.
 a {b: calc(1px + 1/1px)}
 
 <===> numerator_and_denominator/error
-Error: Number 1px^-1 isn't compatible with CSS calculations.
+Error: Number calc(1 / 1px) isn't compatible with CSS calculations.
   ,
 1 | a {b: calc(1px + 1/1px)}
   |            ^^^^^^^^^^^
@@ -41,7 +41,7 @@ Error: Number 1px^-1 isn't compatible with CSS calculations.
 a {b: calc(1px + 1px*1px)}
 
 <===> numerator_and_numerators/error
-Error: Number 1px*px isn't compatible with CSS calculations.
+Error: Number calc(1px * 1px) isn't compatible with CSS calculations.
   ,
 1 | a {b: calc(1px + 1px*1px)}
   |            ^^^^^^^^^^^^^
@@ -54,7 +54,7 @@ Error: Number 1px*px isn't compatible with CSS calculations.
 a {b: calc(1/1px + 1/1px/1px)}
 
 <===> denominator_and_denominators/error
-Error: Number 1px^-1 isn't compatible with CSS calculations.
+Error: Number calc(1 / 1px) isn't compatible with CSS calculations.
   ,
 1 | a {b: calc(1/1px + 1/1px/1px)}
   |            ^^^^^^^^^^^^^^^^^
@@ -67,7 +67,7 @@ Error: Number 1px^-1 isn't compatible with CSS calculations.
 a {b: calc(1px*1s + 1px*1px)}
 
 <===> mismatched_numerators/error
-Error: Number 1px*s isn't compatible with CSS calculations.
+Error: Number calc(1px * 1s) isn't compatible with CSS calculations.
   ,
 1 | a {b: calc(1px*1s + 1px*1px)}
   |            ^^^^^^^^^^^^^^^^
@@ -80,7 +80,7 @@ Error: Number 1px*s isn't compatible with CSS calculations.
 a {b: calc(1/1px/1s + 1/1px/1px)}
 
 <===> mismatched_denominators/error
-Error: Number 1(px*s)^-1 isn't compatible with CSS calculations.
+Error: Number calc(1 / 1px / 1s) isn't compatible with CSS calculations.
   ,
 1 | a {b: calc(1/1px/1s + 1/1px/1px)}
   |            ^^^^^^^^^^^^^^^^^^^^
diff --git a/spec/values/calculation/clamp.hrx b/spec/values/calculation/clamp.hrx
index 0254ae43d..84a05a1b1 100644
--- a/spec/values/calculation/clamp.hrx
+++ b/spec/values/calculation/clamp.hrx
@@ -128,7 +128,7 @@ Error: 1px and 3s are incompatible.
 a {b: clamp(1px*1px, 2%*2%, 3px*3px)}
 
 <===> error/complex_unit/error
-Error: Number 1px*px isn't compatible with CSS calculations.
+Error: Number calc(1px * 1px) isn't compatible with CSS calculations.
   ,
 1 | a {b: clamp(1px*1px, 2%*2%, 3px*3px)}
   |             ^^^^^^^
diff --git a/spec/values/calculation/cos.hrx b/spec/values/calculation/cos.hrx
index 96524f9b0..9c5c6fba9 100644
--- a/spec/values/calculation/cos.hrx
+++ b/spec/values/calculation/cos.hrx
@@ -137,7 +137,7 @@ Error: $number: Expected 1px to have an angle unit (deg, grad, rad, turn).
 a {b: cos(-7px / 4em)}
 
 <===> error/unit/complex/error
-Error: $number: Expected -1.75px/em to have an angle unit (deg, grad, rad, turn).
+Error: $number: Expected calc(-1.75px / 1em) to have an angle unit (deg, grad, rad, turn).
   ,
 1 | a {b: cos(-7px / 4em)}
   |       ^^^^^^^^^^^^^^^
diff --git a/spec/values/calculation/hypot.hrx b/spec/values/calculation/hypot.hrx
index d885b3e85..e865f809d 100644
--- a/spec/values/calculation/hypot.hrx
+++ b/spec/values/calculation/hypot.hrx
@@ -139,7 +139,7 @@ a {
 a {b: hypot(-7px / 4em)}
 
 <===> error/unsimplifiable/error
-Error: Number -1.75px/em isn't compatible with CSS calculations.
+Error: Number calc(-1.75px / 1em) isn't compatible with CSS calculations.
   ,
 1 | a {b: hypot(-7px / 4em)}
   |             ^^^^^^^^^^
diff --git a/spec/values/calculation/log.hrx b/spec/values/calculation/log.hrx
index eeab121d8..aa680b02b 100644
--- a/spec/values/calculation/log.hrx
+++ b/spec/values/calculation/log.hrx
@@ -170,7 +170,7 @@ Error: Expected 1deg to have no units.
 a {b: log(1px*2px, 10%)}
 
 <===> error/units/complex_and_unknown/error
-Error: Expected 2px*px to have no units.
+Error: Expected calc(2px * 1px) to have no units.
   ,
 1 | a {b: log(1px*2px, 10%)}
   |       ^^^^^^^^^^^^^^^^^
diff --git a/spec/values/calculation/max.hrx b/spec/values/calculation/max.hrx
index f7bd037de..cbcef327b 100644
--- a/spec/values/calculation/max.hrx
+++ b/spec/values/calculation/max.hrx
@@ -103,7 +103,7 @@ Error: 1px and 2 are incompatible.
 a {b: max(1px*1px, 2%*2%)}
 
 <===> error/complex_unit/error
-Error: Number 1px*px isn't compatible with CSS calculations.
+Error: Number calc(1px * 1px) isn't compatible with CSS calculations.
   ,
 1 | a {b: max(1px*1px, 2%*2%)}
   |           ^^^^^^^
diff --git a/spec/values/calculation/min.hrx b/spec/values/calculation/min.hrx
index a1c762ff6..9a121be89 100644
--- a/spec/values/calculation/min.hrx
+++ b/spec/values/calculation/min.hrx
@@ -103,7 +103,7 @@ Error: 1px and 2 are incompatible.
 a {b: min(1px*1px, 2%*2%)}
 
 <===> error/complex_unit/error
-Error: Number 1px*px isn't compatible with CSS calculations.
+Error: Number calc(1px * 1px) isn't compatible with CSS calculations.
   ,
 1 | a {b: min(1px*1px, 2%*2%)}
   |           ^^^^^^^
diff --git a/spec/values/calculation/mod.hrx b/spec/values/calculation/mod.hrx
index 723f6847c..8d9f10780 100644
--- a/spec/values/calculation/mod.hrx
+++ b/spec/values/calculation/mod.hrx
@@ -269,7 +269,7 @@ Error: 16px and 5deg are incompatible.
 a {b: mod(1px*2px, 10%)}
 
 <===> error/units/complex_and_unknown/error
-Error: Number 2px*px isn't compatible with CSS calculations.
+Error: Number calc(2px * 1px) isn't compatible with CSS calculations.
   ,
 1 | a {b: mod(1px*2px, 10%)}
   |           ^^^^^^^
diff --git a/spec/values/calculation/rem.hrx b/spec/values/calculation/rem.hrx
index f92c4afa1..f3d1c62a4 100644
--- a/spec/values/calculation/rem.hrx
+++ b/spec/values/calculation/rem.hrx
@@ -269,7 +269,7 @@ Error: 16px and 5deg are incompatible.
 a {b: rem(1px*2px, 10%)}
 
 <===> error/units/complex_and_unknown/error
-Error: Number 2px*px isn't compatible with CSS calculations.
+Error: Number calc(2px * 1px) isn't compatible with CSS calculations.
   ,
 1 | a {b: rem(1px*2px, 10%)}
   |           ^^^^^^^
diff --git a/spec/values/calculation/round/error.hrx b/spec/values/calculation/round/error.hrx
index 9956371d4..b1dd43131 100644
--- a/spec/values/calculation/round/error.hrx
+++ b/spec/values/calculation/round/error.hrx
@@ -114,7 +114,7 @@ Error: 10deg and 5px are incompatible.
 a {b: round(1px*2px, 10%)}
 
 <===> two_argument/units/complex_and_unknown/error
-Error: Number 2px*px isn't compatible with CSS calculations.
+Error: Number calc(2px * 1px) isn't compatible with CSS calculations.
   ,
 1 | a {b: round(1px*2px, 10%)}
   |             ^^^^^^^
diff --git a/spec/values/calculation/sin.hrx b/spec/values/calculation/sin.hrx
index 0ad4c3460..ae8f1c095 100644
--- a/spec/values/calculation/sin.hrx
+++ b/spec/values/calculation/sin.hrx
@@ -147,7 +147,7 @@ Error: $number: Expected 1px to have an angle unit (deg, grad, rad, turn).
 a {b: sin(-7px / 4em)}
 
 <===> error/units/complex/error
-Error: $number: Expected -1.75px/em to have an angle unit (deg, grad, rad, turn).
+Error: $number: Expected calc(-1.75px / 1em) to have an angle unit (deg, grad, rad, turn).
   ,
 1 | a {b: sin(-7px / 4em)}
   |       ^^^^^^^^^^^^^^^
diff --git a/spec/values/calculation/tan.hrx b/spec/values/calculation/tan.hrx
index 118e2e490..40cf126bb 100644
--- a/spec/values/calculation/tan.hrx
+++ b/spec/values/calculation/tan.hrx
@@ -147,7 +147,7 @@ Error: $number: Expected 1px to have an angle unit (deg, grad, rad, turn).
 a {b: tan(-7px / 4em)}
 
 <===> error/units/complex/error
-Error: $number: Expected -1.75px/em to have an angle unit (deg, grad, rad, turn).
+Error: $number: Expected calc(-1.75px / 1em) to have an angle unit (deg, grad, rad, turn).
   ,
 1 | a {b: tan(-7px / 4em)}
   |       ^^^^^^^^^^^^^^^
diff --git a/spec/values/numbers/degenerate.hrx b/spec/values/numbers/degenerate.hrx
index 711fd4103..69433b772 100644
--- a/spec/values/numbers/degenerate.hrx
+++ b/spec/values/numbers/degenerate.hrx
@@ -69,7 +69,7 @@ a {
 a {b: math.div(1px * 1em, 0)}
 
 <===> error/infinity/multiple_numerator_units/error
-Error: calc(Infinitypx*em) isn't a valid CSS value.
+Error: calc(infinity * 1px * 1em) isn't a valid CSS value.
   ,
 2 | a {b: math.div(1px * 1em, 0)}
   |       ^^^^^^^^^^^^^^^^^^^^^^
@@ -83,7 +83,7 @@ Error: calc(Infinitypx*em) isn't a valid CSS value.
 a {b: math.div(1, 0px)}
 
 <===> error/infinity/denominator_unit/error
-Error: calc(Infinitypx^-1) isn't a valid CSS value.
+Error: calc(infinity / 1px) isn't a valid CSS value.
   ,
 2 | a {b: math.div(1, 0px)}
   |       ^^^^^^^^^^^^^^^^
@@ -97,7 +97,7 @@ Error: calc(Infinitypx^-1) isn't a valid CSS value.
 a {b: math.div(1px, 0em)}
 
 <===> error/infinity/numerator_and_denominator_unit/error
-Error: calc(Infinitypx/em) isn't a valid CSS value.
+Error: calc(infinity * 1px / 1em) isn't a valid CSS value.
   ,
 2 | a {b: math.div(1px, 0em)}
   |       ^^^^^^^^^^^^^^^^^^
@@ -111,7 +111,7 @@ Error: calc(Infinitypx/em) isn't a valid CSS value.
 a {b: math.div(-1px * 1em, 0)}
 
 <===> error/minus_infinity/multiple_numerator_units/error
-Error: calc(-Infinitypx*em) isn't a valid CSS value.
+Error: calc(-infinity * 1px * 1em) isn't a valid CSS value.
   ,
 2 | a {b: math.div(-1px * 1em, 0)}
   |       ^^^^^^^^^^^^^^^^^^^^^^^
@@ -125,7 +125,7 @@ Error: calc(-Infinitypx*em) isn't a valid CSS value.
 a {b: math.div(-1, 0px)}
 
 <===> error/minus_infinity/denominator_unit/error
-Error: calc(-Infinitypx^-1) isn't a valid CSS value.
+Error: calc(-infinity / 1px) isn't a valid CSS value.
   ,
 2 | a {b: math.div(-1, 0px)}
   |       ^^^^^^^^^^^^^^^^^
@@ -139,7 +139,7 @@ Error: calc(-Infinitypx^-1) isn't a valid CSS value.
 a {b: math.div(-1px, 0em)}
 
 <===> error/minus_infinity/numerator_and_denominator_unit/error
-Error: calc(-Infinitypx/em) isn't a valid CSS value.
+Error: calc(-infinity * 1px / 1em) isn't a valid CSS value.
   ,
 2 | a {b: math.div(-1px, 0em)}
   |       ^^^^^^^^^^^^^^^^^^^
@@ -153,7 +153,7 @@ Error: calc(-Infinitypx/em) isn't a valid CSS value.
 a {b: math.div(0px * 0em, 0)}
 
 <===> error/nan/multiple_numerator_units/error
-Error: calc(NaNpx*em) isn't a valid CSS value.
+Error: calc(NaN * 1px * 1em) isn't a valid CSS value.
   ,
 2 | a {b: math.div(0px * 0em, 0)}
   |       ^^^^^^^^^^^^^^^^^^^^^^
@@ -167,7 +167,7 @@ Error: calc(NaNpx*em) isn't a valid CSS value.
 a {b: math.div(0, 0px)}
 
 <===> error/nan/denominator_unit/error
-Error: calc(NaNpx^-1) isn't a valid CSS value.
+Error: calc(NaN / 1px) isn't a valid CSS value.
   ,
 2 | a {b: math.div(0, 0px)}
   |       ^^^^^^^^^^^^^^^^
@@ -181,7 +181,7 @@ Error: calc(NaNpx^-1) isn't a valid CSS value.
 a {b: math.div(0px, 0em)}
 
 <===> error/nan/numerator_and_denominator_unit/error
-Error: calc(NaNpx/em) isn't a valid CSS value.
+Error: calc(NaN * 1px / 1em) isn't a valid CSS value.
   ,
 2 | a {b: math.div(0px, 0em)}
   |       ^^^^^^^^^^^^^^^^^^
diff --git a/spec/values/numbers/units/multiple/divide_by_multiple_denominators.hrx b/spec/values/numbers/units/multiple/divide_by_multiple_denominators.hrx
index e74f859c1..207b31489 100644
--- a/spec/values/numbers/units/multiple/divide_by_multiple_denominators.hrx
+++ b/spec/values/numbers/units/multiple/divide_by_multiple_denominators.hrx
@@ -5,7 +5,7 @@ a {
 
 <===> output.css
 a {
-  b: 1px*rad;
+  b: calc(1px * 1rad);
 }
 
 <===> warning
diff --git a/spec/values/numbers/units/multiple/divide_by_multiple_numerators.hrx b/spec/values/numbers/units/multiple/divide_by_multiple_numerators.hrx
index 449d2c921..ccbc7883a 100644
--- a/spec/values/numbers/units/multiple/divide_by_multiple_numerators.hrx
+++ b/spec/values/numbers/units/multiple/divide_by_multiple_numerators.hrx
@@ -5,7 +5,7 @@ a {
 
 <===> output.css
 a {
-  b: 1(px*rad)^-1;
+  b: calc(1 / 1px / 1rad);
 }
 
 <===> warning
diff --git a/spec/values/numbers/units/multiple/division_cancels_both.hrx b/spec/values/numbers/units/multiple/division_cancels_both.hrx
index 7f6852c0d..463b74501 100644
--- a/spec/values/numbers/units/multiple/division_cancels_both.hrx
+++ b/spec/values/numbers/units/multiple/division_cancels_both.hrx
@@ -6,7 +6,7 @@ a {
 
 <===> output.css
 a {
-  b: 1rad/Hz;
+  b: calc(1rad / 1Hz);
 }
 
 <===> warning
diff --git a/spec/values/numbers/units/multiple/division_cancels_compatible.hrx b/spec/values/numbers/units/multiple/division_cancels_compatible.hrx
index 385a9f6a4..4b3b6bc5f 100644
--- a/spec/values/numbers/units/multiple/division_cancels_compatible.hrx
+++ b/spec/values/numbers/units/multiple/division_cancels_compatible.hrx
@@ -6,7 +6,7 @@ a {
 
 <===> output.css
 a {
-  b: 0.0104166667rad/ms*Hz;
+  b: calc(0.0104166667rad / 1ms / 1Hz);
 }
 
 <===> warning
diff --git a/spec/values/numbers/units/multiple/division_cancels_denominator.hrx b/spec/values/numbers/units/multiple/division_cancels_denominator.hrx
index ae0886ec2..ff5bb5d28 100644
--- a/spec/values/numbers/units/multiple/division_cancels_denominator.hrx
+++ b/spec/values/numbers/units/multiple/division_cancels_denominator.hrx
@@ -6,7 +6,7 @@ a {
 
 <===> output.css
 a {
-  b: 1px*rad/Hz;
+  b: calc(1px * 1rad / 1Hz);
 }
 
 <===> warning
diff --git a/spec/values/numbers/units/multiple/division_cancels_denominator_twice.hrx b/spec/values/numbers/units/multiple/division_cancels_denominator_twice.hrx
index d9b240728..9b201fc6a 100644
--- a/spec/values/numbers/units/multiple/division_cancels_denominator_twice.hrx
+++ b/spec/values/numbers/units/multiple/division_cancels_denominator_twice.hrx
@@ -6,7 +6,7 @@ a {
 
 <===> output.css
 a {
-  b: 1px*rad;
+  b: calc(1px * 1rad);
 }
 
 <===> warning
diff --git a/spec/values/numbers/units/multiple/division_cancels_numerator.hrx b/spec/values/numbers/units/multiple/division_cancels_numerator.hrx
index 0989bd801..b35ffcf2d 100644
--- a/spec/values/numbers/units/multiple/division_cancels_numerator.hrx
+++ b/spec/values/numbers/units/multiple/division_cancels_numerator.hrx
@@ -6,7 +6,7 @@ a {
 
 <===> output.css
 a {
-  b: 1rad/ms*Hz;
+  b: calc(1rad / 1ms / 1Hz);
 }
 
 <===> warning
diff --git a/spec/values/numbers/units/multiple/division_cancels_numerator_twice.hrx b/spec/values/numbers/units/multiple/division_cancels_numerator_twice.hrx
index a2f1b68c4..ec7d700e9 100644
--- a/spec/values/numbers/units/multiple/division_cancels_numerator_twice.hrx
+++ b/spec/values/numbers/units/multiple/division_cancels_numerator_twice.hrx
@@ -6,7 +6,7 @@ a {
 
 <===> output.css
 a {
-  b: 1(ms*Hz)^-1;
+  b: calc(1 / 1ms / 1Hz);
 }
 
 <===> warning
diff --git a/spec/values/numbers/units/multiple/division_cancels_unknown.hrx b/spec/values/numbers/units/multiple/division_cancels_unknown.hrx
index b7054df5c..910a8baf1 100644
--- a/spec/values/numbers/units/multiple/division_cancels_unknown.hrx
+++ b/spec/values/numbers/units/multiple/division_cancels_unknown.hrx
@@ -7,7 +7,7 @@ a {
 
 <===> output.css
 a {
-  b: 1bar/baz*qux;
+  b: calc(1bar / 1baz / 1qux);
 }
 
 <===> warning
diff --git a/spec/values/numbers/units/multiple/multiple_denominators.hrx b/spec/values/numbers/units/multiple/multiple_denominators.hrx
index b8acb9120..d0e476be6 100644
--- a/spec/values/numbers/units/multiple/multiple_denominators.hrx
+++ b/spec/values/numbers/units/multiple/multiple_denominators.hrx
@@ -5,7 +5,7 @@ a {
 
 <===> output.css
 a {
-  b: 1(px*rad)^-1;
+  b: calc(1 / 1px / 1rad);
 }
 
 <===> warning
diff --git a/spec/values/numbers/units/multiple/multiple_numerators.hrx b/spec/values/numbers/units/multiple/multiple_numerators.hrx
index 7944975a1..125233ce5 100644
--- a/spec/values/numbers/units/multiple/multiple_numerators.hrx
+++ b/spec/values/numbers/units/multiple/multiple_numerators.hrx
@@ -5,5 +5,5 @@ a {
 
 <===> output.css
 a {
-  b: 1px*rad;
+  b: calc(1px * 1rad);
 }
diff --git a/spec/values/numbers/units/multiple/multiplication_cancels_both.hrx b/spec/values/numbers/units/multiple/multiplication_cancels_both.hrx
index 90aa07b12..30ee9a9dd 100644
--- a/spec/values/numbers/units/multiple/multiplication_cancels_both.hrx
+++ b/spec/values/numbers/units/multiple/multiplication_cancels_both.hrx
@@ -6,7 +6,7 @@ a {
 
 <===> output.css
 a {
-  b: 1rad/Hz;
+  b: calc(1rad / 1Hz);
 }
 
 <===> warning
diff --git a/spec/values/numbers/units/multiple/multiplication_cancels_compatible.hrx b/spec/values/numbers/units/multiple/multiplication_cancels_compatible.hrx
index fa00670e7..38266e904 100644
--- a/spec/values/numbers/units/multiple/multiplication_cancels_compatible.hrx
+++ b/spec/values/numbers/units/multiple/multiplication_cancels_compatible.hrx
@@ -6,7 +6,7 @@ a {
 
 <===> output.css
 a {
-  b: 1000px*rad/Hz;
+  b: calc(1000px * 1rad / 1Hz);
 }
 
 <===> warning
diff --git a/spec/values/numbers/units/multiple/multiplication_cancels_denominator.hrx b/spec/values/numbers/units/multiple/multiplication_cancels_denominator.hrx
index 6e51a1e0c..e075e321f 100644
--- a/spec/values/numbers/units/multiple/multiplication_cancels_denominator.hrx
+++ b/spec/values/numbers/units/multiple/multiplication_cancels_denominator.hrx
@@ -6,7 +6,7 @@ a {
 
 <===> output.css
 a {
-  b: 1px*rad/Hz;
+  b: calc(1px * 1rad / 1Hz);
 }
 
 <===> warning
diff --git a/spec/values/numbers/units/multiple/multiplication_cancels_denominator_twice.hrx b/spec/values/numbers/units/multiple/multiplication_cancels_denominator_twice.hrx
index 4d9717e80..1c471b9bb 100644
--- a/spec/values/numbers/units/multiple/multiplication_cancels_denominator_twice.hrx
+++ b/spec/values/numbers/units/multiple/multiplication_cancels_denominator_twice.hrx
@@ -6,7 +6,7 @@ a {
 
 <===> output.css
 a {
-  b: 1px*rad;
+  b: calc(1px * 1rad);
 }
 
 <===> warning
diff --git a/spec/values/numbers/units/multiple/multiplication_cancels_numerator.hrx b/spec/values/numbers/units/multiple/multiplication_cancels_numerator.hrx
index b3682e104..ccf7dea84 100644
--- a/spec/values/numbers/units/multiple/multiplication_cancels_numerator.hrx
+++ b/spec/values/numbers/units/multiple/multiplication_cancels_numerator.hrx
@@ -6,7 +6,7 @@ a {
 
 <===> output.css
 a {
-  b: 1rad/ms*Hz;
+  b: calc(1rad / 1ms / 1Hz);
 }
 
 <===> warning
diff --git a/spec/values/numbers/units/multiple/multiplication_cancels_numerator_twice.hrx b/spec/values/numbers/units/multiple/multiplication_cancels_numerator_twice.hrx
index 0ba910d17..78fc1da7f 100644
--- a/spec/values/numbers/units/multiple/multiplication_cancels_numerator_twice.hrx
+++ b/spec/values/numbers/units/multiple/multiplication_cancels_numerator_twice.hrx
@@ -6,7 +6,7 @@ a {
 
 <===> output.css
 a {
-  b: 1(ms*Hz)^-1;
+  b: calc(1 / 1ms / 1Hz);
 }
 
 <===> warning
diff --git a/spec/values/numbers/units/multiple/multiplication_cancels_unknown.hrx b/spec/values/numbers/units/multiple/multiplication_cancels_unknown.hrx
index ffa12d0a9..ab2af839f 100644
--- a/spec/values/numbers/units/multiple/multiplication_cancels_unknown.hrx
+++ b/spec/values/numbers/units/multiple/multiplication_cancels_unknown.hrx
@@ -7,7 +7,7 @@ a {
 
 <===> output.css
 a {
-  b: 1foo*bar/qux;
+  b: calc(1foo * 1bar / 1qux);
 }
 
 <===> warning