Added short-circuit support to BooleanMacro when used with logical expressions &&, &, | and ||.