Simplify / make it clearer that we always go through the invariant.