Ensure we resolve all the segments when we can.
Bump version.