diff --git a/lib/Bytecode/Writer/InstructionWriter.cpp b/lib/Bytecode/Writer/InstructionWriter.cpp
index bb0990d..256f7c8 100644
--- a/lib/Bytecode/Writer/InstructionWriter.cpp
+++ b/lib/Bytecode/Writer/InstructionWriter.cpp
@@ -215,7 +215,7 @@
     if (Slots[1] > MaxOpSlot) MaxOpSlot = Slots[1];
     NumOperands++;
   } else if (I->getOpcode() == Instruction::Call &&  // Handle VarArg calls
-	     I->getOperand(0)->getType()->castMethodType()->isVarArg()) {
+	     cast<MethodType>(I->getOperand(0)->getType())->isVarArg()) {
     outputInstrVarArgsCall(I, Table, Type, Out);
     return;
   }
diff --git a/lib/Bytecode/Writer/Writer.cpp b/lib/Bytecode/Writer/Writer.cpp
index da48018..04a0ca4 100644
--- a/lib/Bytecode/Writer/Writer.cpp
+++ b/lib/Bytecode/Writer/Writer.cpp
@@ -108,7 +108,7 @@
 	//     << Out.size() << "\n";
 	outputConstant(CPV);
       } else {
-	const Type *Ty = V->castTypeAsserting();
+	const Type *Ty = cast<const Type>(V);
 	outputType(Ty);
       }
     }