Clean up the Envelope class. (It may be changed back to struct, tho.)