Fix class to class/instance bindings (#89)