Revert "Enable (more) prefix lookups in legacy macros"

This reverts commit efac83ccae5d1bad91516a7124531ac1a720fbdb.
Revert "Enable prefix lookups in legacy macros"

This reverts commit 9761cd2093aa72f551acf4db33a80072df90d8fb.
Refactor legacy checks to improve legacy macro support
More refactoring/cleanup for improved legacy macro support
Improve offside-rule handling of legacy macros