More work on type classes.

And beautification.
Gimmick-compatibility addition.