collator perf improvements

partial cherry-pick from 59594d427db0ec22ad62587c84bd45b1caa00f5d