@shadyvb I don't see anywhere where $super is nulled. Perhaps we should add a default to the switch above.