Merge "Clean up create_disk() a little"