Remove debug displays
Attempt to support recursive types in classes better

Still not sure this is quite right