Remove soon-to-be-obsolete method references, and re-organize a teensy bit of the usage for collections.