first draft for environment macros (tests fail)
switch to 'call by name' for macro-expansion