Fix whitespace and make DOCKER_STORAGE logic more trusting of Docker to "do the right thing"