SI-8270 unconfuses bundles and vanilla macros