diff --git a/lib/VMCore/AsmWriter.cpp b/lib/VMCore/AsmWriter.cpp
index 4d055e7..df5cabc 100644
--- a/lib/VMCore/AsmWriter.cpp
+++ b/lib/VMCore/AsmWriter.cpp
@@ -732,14 +732,15 @@
   case Module::Pointer64:    Out << "target pointersize = 64\n"; break;
   case Module::AnyPointerSize: break;
   }
-  if (M->getTargetTriple().size() > 0)
+  if (!M->getTargetTriple().empty())
     Out << "target triple = \"" << M->getTargetTriple() << "\"\n";
   
   // Loop over the dependent libraries and emit them
-  if (M->lib_size() > 0) {
+  Module::lib_iterator LI= M->lib_begin();
+  Module::lib_iterator LE= M->lib_end();
+  if (LI != LE) {
     Out << "deplibs = [\n";
-    for (Module::lib_iterator LI = M->lib_begin(), LE = M->lib_end(); 
-         LI != LE; ) {
+    while ( LI != LE ) {
       Out << "\"" << *LI << "\"";
       ++LI;
       if ( LI != LE )