Clarify poly-branch macro names (resolves [fbbb5ed9])