Use std::make_shared and make_unique where possible, part 2