More vdev_disk.c cleanup