Ported to new collection classes.