Prepr: working on macro expansion