Reworking next_version system

It should still be improved, but at least we can safely create bundle
versions at the same time.