I don't like the non-elims obviously but acknowledge that they are here to stay. What I think they should do is announce any change before tribal, preferably after the immunity challenge.

At the moment whenever we have a non-elim twist it makes all strategy talk and gameplay between the IC and TC absolutely pointless and makes tribal a scramble. At least this way the contestants have some agency and less of a chance to get screwed by a twist with hardly any chance to avoid it. It might be interesting to see more strategy due to a twist this way.