Canonicalize collections in builder pattern (not finished yet)

for testing
it shouldn't, right? I have changed ```baseTerms``` to be a set.