Fixes for new use of poly-branch macros