Full draft of macro expander in place.