Syntax cleanup...
Support for super calls.