Rearrange Dockerfile to hopefully produce less garbage.