Changing Collection<T>s to Set<T>s elsewhere.
Adjusting DTDs.