Fix several incorrect type constructors.
Fix typing for 'this'.