Issue #201: WIP Refactor version negotiation.