Added more substitutions to the typechecker. No Global Type Vars should appear.