Removed unnecessary code from fix empty types
Introduced the concept of owned instance vars.