Fix some -Wshadow warnings.

What about `s/theEnvelope2/envelope/`?