diff --git a/assets/shorthands.tex b/assets/shorthands.tex
index f386ad6..817dcd6 100644
--- a/assets/shorthands.tex
+++ b/assets/shorthands.tex
@@ -1,53 +1,56 @@
 % General math overrides
-\renewcommand{\implies}{\rightarrow}
+\renewcommand*{\implies}{\rightarrow}
 
 % Academic writing
-\newcommand{\eg}{e.g.,\xspace{}}
-\newcommand{\ie}{i.e.,\xspace{}}
+\newcommand*{\eg}{e.g.,\xspace{}}
+\newcommand*{\ie}{i.e.,\xspace{}}
 
 % Glossary entries
-\newcommand{\Cmls}{\Glspl{cml}}
-\newcommand{\cmls}{\glspl{cml}}
-\newcommand{\cml}{\gls{cml}}
-\newcommand{\compiler}{\glspl{compiler}\xspace{}}
-\newcommand{\constraints}{\glspl{constraint}\xspace{}}
-\newcommand{\constraint}{\gls{constraint}\xspace{}}
-\newcommand{\flatzinc}{\gls{flatzinc}\xspace{}}
-\newcommand{\interpreter}{\gls{interpreter}\xspace{}}
-\newcommand{\microzinc}{\gls{microzinc}\xspace{}}
-\newcommand{\minisearch}{\gls{minisearch}\xspace{}}
-\newcommand{\minizinc}{\gls{minizinc}\xspace{}}
-\newcommand{\model}{\gls{model}\xspace{}}
-\newcommand{\nanozinc}{\gls{nanozinc}\xspace{}}
-\newcommand{\parameters}{\glspl{parameter}\xspace{}}
-\newcommand{\parameter}{\gls{parameter}\xspace{}}
-\newcommand{\solvers}{\glspl{solver}\xspace{}}
-\newcommand{\solver}{\gls{solver}\xspace{}}
-\newcommand{\variables}{\glspl{variable}\xspace{}}
-\newcommand{\variable}{\gls{variable}\xspace{}}
-\newcommand{\zinc}{\gls{zinc}\xspace{}}
+\newcommand*{\Cmls}{\Glspl{cml}}
+\newcommand*{\cmls}{\glspl{cml}}
+\newcommand*{\cml}{\gls{cml}}
+\newcommand*{\compiler}{\glspl{compiler}\xspace{}}
+\newcommand*{\constraints}{\glspl{constraint}\xspace{}}
+\newcommand*{\constraint}{\gls{constraint}\xspace{}}
+\newcommand*{\flatzinc}{\gls{flatzinc}\xspace{}}
+\newcommand*{\interpreter}{\gls{interpreter}\xspace{}}
+\newcommand*{\instance}{\gls{instance}\xspace{}}
+\newcommand*{\instances}{\glspl{instance}\xspace{}}
+\newcommand*{\microzinc}{\gls{microzinc}\xspace{}}
+\newcommand*{\minisearch}{\gls{minisearch}\xspace{}}
+\newcommand*{\minizinc}{\gls{minizinc}\xspace{}}
+\newcommand*{\cmodel}{\gls{model}\xspace{}}
+\newcommand*{\cmodels}[0]{\glspl{model}\xspace{}}
+\newcommand*{\nanozinc}{\gls{nanozinc}\xspace{}}
+\newcommand*{\parameters}{\glspl{parameter}\xspace{}}
+\newcommand*{\parameter}{\gls{parameter}\xspace{}}
+\newcommand*{\solvers}{\glspl{solver}\xspace{}}
+\newcommand*{\solver}{\gls{solver}\xspace{}}
+\newcommand*{\variables}{\glspl{variable}\xspace{}}
+\newcommand*{\variable}{\gls{variable}\xspace{}}
+\newcommand*{\zinc}{\gls{zinc}\xspace{}}
 
 % Semantic syntax (rewriting)
 \renewcommand{\phi}{\varphi}
-\newcommand{\tuple}[1]{\ensuremath{\langle #1 \rangle}}
-\newcommand{\Prog}{\ensuremath{\mathcal{P}}}
-\newcommand{\Ctx}{\ensuremath{\phi}}
-\newcommand{\Env}{\ensuremath{\sigma}}
-\newcommand{\Sem}[2]{\ptinline{[\!\![#1]\!\!]\tuple{#2}}}
-\newcommand{\Cbind}{\ensuremath{\wedge}}
+\newcommand*{\tuple}[1]{\ensuremath{\langle #1 \rangle}}
+\newcommand*{\Prog}{\ensuremath{\mathcal{P}}}
+\newcommand*{\Ctx}{\ensuremath{\phi}}
+\newcommand*{\Env}{\ensuremath{\sigma}}
+\newcommand*{\Sem}[2]{\ptinline{[\!\![#1]\!\!]\tuple{#2}}}
+\newcommand*{\Cbind}{\ensuremath{\wedge}}
 
 % Context syntax (half-reification)
-\newcommand{\rootc}{\textit{root}}
-\newcommand{\posc}{\textit{pos}}
-\newcommand{\negc}{\textit{neg}}
-\newcommand{\mixc}{\textit{mix}}
-\newcommand{\mayberootc}{\textit{root?}}
-\newcommand{\changepos}{\ensuremath{+}}
-\newcommand{\changeneg}{\ensuremath{-}}
+\newcommand*{\rootc}{\textit{root}}
+\newcommand*{\posc}{\textit{pos}}
+\newcommand*{\negc}{\textit{neg}}
+\newcommand*{\mixc}{\textit{mix}}
+\newcommand*{\mayberootc}{\textit{root?}}
+\newcommand*{\changepos}{\ensuremath{+}}
+\newcommand*{\changeneg}{\ensuremath{-}}
 
 % Context analysis syntax
-\newcommand{\ctxeval}[2]{\ensuremath{\mathbb{M}\left(#2\right)\left\|~#1~\right\|}}
-\newcommand{\ctxfunc}[2]{\ensuremath{\mathbb{F}\left(#2\right)\left\|~#1~\right\|}}
-\newcommand{\ctxitem}[1]{\ensuremath{\mathbb{m}\left\|~#1~\right\|}}
+\newcommand*{\ctxeval}[2]{\ensuremath{\mathbb{M}\left(#2\right)\left\|~#1~\right\|}}
+\newcommand*{\ctxfunc}[2]{\ensuremath{\mathbb{F}\left(#2\right)\left\|~#1~\right\|}}
+\newcommand*{\ctxitem}[1]{\ensuremath{\mathbb{m}\left\|~#1~\right\|}}
 
-\newcommand{\undefined}{\ensuremath{\bot}}
+\newcommand*{\undefined}{\ensuremath{\bot}}