checkstyle: import order. (Missed a few.)