Use whitebox instead of blackbox macros