Switch to whitebox macros