Remove unnecessary uses of \expandafter