Dot-imports were only used in a couple of places, and replacing them makes it more explicit what's imported. Signed-off-by: Sebastiaan van Stijn <github@gone.nl>