Fix up bench for latest API
~2x speedup for components
Graph should not have an initial label
Extract common code