Fix up pyro_cluster code to fit in with changes to analysis.