Cleanup in constr, correct classification of polymorphic defs.