Both defer and withDelay now properly pass the envelope. Fixes #41

I updated the tests to verify this change.