CollectionRelevanceCalculator spec improvements

I still don't want to spec the whole thing, but I did spec a few lines
that were untouched. Minor improvements... and they were painful. Sigh.