Tiny changes to PyEnvelope.