Add support for custom token types through generics

[aidantwoods]

This would be a breaking change, so if this is merged it'll be a major version bump. Unsure if I like this new API, so letting this sit for a bit.