More type-cleaning