Fix for 'super' catching-all.