refactor macroexpand-1