Clean up dependency-str weirdness of version calculation.