Merge "Tweak liveness when instructions are used in environments."