Refactor how pavement version management works some more