This commit also simplifies macro expansion for both imports and aliases to always give higher preference to the macro environment rather than the caller one, if such is available. The deal is to simplify both the code and understanding of how macros work.