Fix macroexpand bug