Fix broken short_circuit/rewire for Issue #71

cc/ @bmoyles