Env becomes a simple list of (String, Val)
Merge branch 'master' into madoka