Find a nicer way to deal with versions

[samchungy]

Since we are piping around the state object. We can potentially use that as a generic typeguard for when to use 3.1 vs 3.0 types

[samchungy]

Thought of using conditional return types but that doesn't look possible:

https://github.com/microsoft/TypeScript/issues/33014