Add some more to CallInst and StoreInst