Further work on versioning.