Minor refactoring
Restore special expansion of %FOR and %FUNCTION
WIP
Correctly handle expansion of %FUNCTION, not just FN
Define macro WITH-FRAME