Move 'expand' into macro_expander.