Even more cleaning up, inc. renaming TypeFamily to TypeClass