there’s still the one special case, but I think it only is needed as an internal detail and not as part of the exec model