Remove a level of indirection from versionization