Sas envelopes: Simplify away some redundant state.
Merge pull request #5405 from hrydgard/envelope-simplifiy

Sas envelopes: Simplify away some redundant state.