agg-reorg: allison's tweaks (mostly minor)