Fix intrinsics for self-inclusion of other intrinsics.