See above. Rather than have _disable and _enable call _rewire/_short_circuit, just move their logic into _enable/_disable (or the new method names I mentioned above)