ClusterTPA revisited.

ClusterTPA(Ex) has been simplefied, and also increased performance a
bit..