All tests pass using first prototype modified macro detector and expander; you should no longer need to consciously "pre-import" the macro definitions before importing the file you wish to transform