Simplifying types and removing old Objective-C types