Handle calls to "super" properly