Avoid sort and recompose stages if all clusters simple

Even has measurable speedup...
1 file changed