Update role intrinsics according to the class-overhaul plan.