Tidy up imports a bit to avoid having to qualify things.