Sketched out possible speed up with short-circuit rollup of items