Make --version/checkout logic more reasonable.