Working around #44
Rewiring super calls, else we crash mixin

Closes #45