Take the headache out of short-circuits