Improved clustering header parsing.