Fix accidental imports of collection helper classes