Move away from a static import as well