Minor fix to MACROEXPAND