addendum to 50890ded: also add early-outs