Have separate code paths instead, otherwise we'd end up inserting the same containments twice. Also add an assert to make sure this doesn't happen anymore. CCBUG:337928