#31: Intermediate commit: massive collection interface redesign.