Update the (WIP) typeclass, demos

Something in the snapshot broke whatever I was doing with the original
TypeClass, so I'll have to rewrite that. I have a feeling it might be
the two generics required to do the transformation.