and/or now short-circuit

Updated to reflect that and/or actually short-circuit now.