(TODO) Improvements to object super calls