Bug 1016738 - Simplify/fix "dead compartment" logic (r=luke,jonco)