Further adoption of instancetype.