Remove _super, as it was inelegant and didn't optimize well