Improved typeclasse structures.