Address comments on intrinsic RFC