diff --git a/tex/generic/pgf/frontendlayer/tikz/libraries/tikzlibrarycalendar.code.tex b/tex/generic/pgf/frontendlayer/tikz/libraries/tikzlibrarycalendar.code.tex
index f3ae3ddfd..98cdffe15 100644
--- a/tex/generic/pgf/frontendlayer/tikz/libraries/tikzlibrarycalendar.code.tex
+++ b/tex/generic/pgf/frontendlayer/tikz/libraries/tikzlibrarycalendar.code.tex
@@ -371,12 +371,12 @@
 
 \def\tikz@lib@cal@handle{%
   \pgfutil@switch\pgfutil@ifx\pgf@let@token{%
-    {;}{\tikz@lib@cal@stop}%
-    {(}{\tikz@lib@cal@name}%)
-    {a}{\tikz@lib@cal@at}%
-    {[}{\tikz@lib@cal@option}%]
-    {i}{\tikz@lib@cal@if}%
-  }{}{\tikz@resetexpandcount\tikz@lib@cal@expand}%
+    {;}{\let\pgfutil@next\tikz@lib@cal@stop}%
+    {(}{\let\pgfutil@next\tikz@lib@cal@name}%)
+    {a}{\let\pgfutil@next\tikz@lib@cal@at}%
+    {[}{\let\pgfutil@next\tikz@lib@cal@option}%]
+    {i}{\let\pgfutil@next\tikz@lib@cal@if}%
+  }{\tikz@resetexpandcount\pgfutil@next}{\tikz@lib@cal@expand}%
 }
 \def\tikz@lib@cal@expand{%
   \advance\tikz@expandcount by -1
diff --git a/tex/generic/pgf/frontendlayer/tikz/tikz.code.tex b/tex/generic/pgf/frontendlayer/tikz/tikz.code.tex
index 0e044ff48..d5244e9e8 100644
--- a/tex/generic/pgf/frontendlayer/tikz/tikz.code.tex
+++ b/tex/generic/pgf/frontendlayer/tikz/tikz.code.tex
@@ -2131,34 +2131,34 @@
 % Central dispatcher for commands
 \def\tikz@handle{%
   \pgfutil@switch\pgfutil@ifx\pgf@let@token{%
-    {(}{\tikz@movetoabs}%)
-    {+}{\tikz@movetorel}%
-    {-}{\tikz@lineto}%
-    {.}{\tikz@dot}%
-    {r}{\tikz@rect}%
-    {n}{\tikz@fig}%
-    {[}{\tikz@parse@options}%]
-    {c}{\tikz@cchar}%
-    {\bgroup}{\tikz@beginscope}%
-    {\egroup}{\tikz@endscope}%
-    {;}{\tikz@finish}%
-    {a}{\tikz@a@char}%
-    {e}{\tikz@e@char}%
-    {g}{\tikz@g@char}%
-    {s}{\tikz@schar}%
-    {|}{\tikz@vh@lineto}%
-    {p}{\pgfsetmovetofirstplotpoint\tikz@pchar}%
-    {t}{\tikz@to}%
-    {\pgfextra}{\tikz@extra}%
-    {\foreach}{\tikz@foreach}%
-    {f}{\tikz@fchar}%
-    {\pgf@stop}{\relax}%
-    {\par}{\tikz@scan@next@command}%
-    {d}{\tikz@decoration}%
-    {l}{\tikz@l@char}%
-    {:}{\tikz@colon@char}%
-    {\relax}{\relax\tikz@scan@next@command}%
-  }{}{\tikz@resetexpandcount\tikz@expand}%
+    {(}{\let\pgfutil@next\tikz@movetoabs}%)
+    {+}{\let\pgfutil@next\tikz@movetorel}%
+    {-}{\let\pgfutil@next\tikz@lineto}%
+    {.}{\let\pgfutil@next\tikz@dot}%
+    {r}{\let\pgfutil@next\tikz@rect}%
+    {n}{\let\pgfutil@next\tikz@fig}%
+    {[}{\let\pgfutil@next\tikz@parse@options}%]
+    {c}{\let\pgfutil@next\tikz@cchar}%
+    {\bgroup}{\let\pgfutil@next\tikz@beginscope}%
+    {\egroup}{\let\pgfutil@next\tikz@endscope}%
+    {;}{\let\pgfutil@next\tikz@finish}%
+    {a}{\let\pgfutil@next\tikz@a@char}%
+    {e}{\let\pgfutil@next\tikz@e@char}%
+    {g}{\let\pgfutil@next\tikz@g@char}%
+    {s}{\let\pgfutil@next\tikz@schar}%
+    {|}{\let\pgfutil@next\tikz@vh@lineto}%
+    {p}{\pgfsetmovetofirstplotpoint\let\pgfutil@next\tikz@pchar}%
+    {t}{\let\pgfutil@next\tikz@to}%
+    {\pgfextra}{\let\pgfutil@next\tikz@extra}%
+    {\foreach}{\let\pgfutil@next\tikz@foreach}%
+    {f}{\let\pgfutil@next\tikz@fchar}%
+    {\pgf@stop}{\let\pgfutil@next\relax}%
+    {\par}{\let\pgfutil@next\tikz@scan@next@command}%
+    {d}{\let\pgfutil@next\tikz@decoration}%
+    {l}{\let\pgfutil@next\tikz@l@char}%
+    {:}{\let\pgfutil@next\tikz@colon@char}%
+    {\relax}{\relax\let\pgfutil@next\tikz@scan@next@command}%
+  }{\tikz@resetexpandcount\pgfutil@next}{\tikz@expand}%
 }%
 
 \def\tikz@l@char{%