PIM-2288: Reorganize use statements