Made more use cases work with the vector space based collation
algorithm.