Some renaming
Cleanup environment passing
Remove TyEnv
Split Env into a Type environment and an extended Annotation environment