More replacing of target-dependent intrinsics with target-indepdent