Were there going to be some changes using a Set here and the LazyCollection stuff below?  Or did it end up in another file?