BW & XY: Fix secondary self-boosting against substitutes.