Index: rvm/src/org/jikesrvm/compilers/opt/inlining/InlineTools.java
===================================================================
--- rvm/src/org/jikesrvm/compilers/opt/inlining/InlineTools.java	(revision 14134)
+++ rvm/src/org/jikesrvm/compilers/opt/inlining/InlineTools.java	(working copy)
@@ -131,17 +131,16 @@
           reductionFactor -= 0.05;      //  5% credit for being extant.
         }
         if (rop.isPreciseType()) {
-          reductionFactor -= 0.15;      // 15% credit for being a precise type.
+          reductionFactor -= 0.10;      // 10% credit for being a precise type.
         }
         if (rop.isDeclaredType()) {
           reductionFactor -= 0.01;      //  1% credit for being a declared type.
         }
-      } else if (op.isIntConstant()) {
-        reductionFactor -= 0.10;        // 10% credit for being an int constant
-      } else if (op.isNullConstant()) {
-        reductionFactor -= 0.15;        // 15% credit for being 'null'
-      } else if (op.isStringConstant()) {
-        reductionFactor -= 0.10;      // 10% credit for being a string constant
+      } else if (op.isConstant()) {
+        reductionFactor -= 0.10;        // 10% credit for being a constant
+        if (op.isNullConstant()) {
+          reductionFactor -= 0.5;       // 5% extra credit for being 'null'
+        }
       }
     }
     reductionFactor = Math.max(reductionFactor, 0.40); // bound credits at 60%