Cleanup clustered query package

This query package had it's API recently unified with query, but the internals were never touched for years and it could use a bit of cleanup.
Too many classes are externally accessible.