PROV-586 Fix for issue causing some related intrinsics to not be indexed