Improvements to clustering support.