Issue #201: WIP Refactor version negotiation.

I really like the idea of benefiting from both versioning options at the same time. I'd rather keep support for both.