Yet more work on cleaning up version handling