Correctly dispatch 'super' in class methods
Fix dispatch of 'super' in class methods