Properly handle new null values for intrinsics