Rename want_short_circuit to short_circuit