Use modern typedef form in cluster.h.