Clean up to check intrinsic IDs rather than intrinsic name strings
FP: Handle ReturnInst and ConstantFP for "double" type