Test found a bug [IMMUTANT-302]
Removed explicit type checks and made more extensible [IMMUTANT-302]

I like this better. Also makes obvious the fact that we only wrap
keys, if we wrap at all.