First tentative macro expansion working.