Minor.
Optimization on unroll of aggregates.
Merge branch 'disjunction' into optimization