Convert old-style collections import to new std::collections