Added usage of envelope rather than second class values only.

Signed-off-by: Jakob Brandsborg Ehmsen <jakobehmsen.github@gmail.com>