needs \xpatchcmd because \patchcmd cannot patch commands with optional
parameters, see xpatch package documentation