[coretext] Minor
[coretext] Simplify cluster mapping
Minor