#KJ-80 6. Cleanup the dependencies between the two semantics. Replaced 'LazyAnd with andAux in non-execution-phase related rules.