extern bool useOldShortCircuit;