Fix super call semantics which break on 1.8