diff --git a/core/src/main/java/hudson/Util.java b/core/src/main/java/hudson/Util.java
index 2aeeb74bd57f23bef2379da30962c151369b4031..1492f364514636fb8a36dfe869b11d69312da12e 100644
--- a/core/src/main/java/hudson/Util.java
+++ b/core/src/main/java/hudson/Util.java
@@ -1569,7 +1569,7 @@ public class Util {
      * give up, thus improving build reliability.
      */
     @Restricted(value = NoExternalUse.class)
-    static int DELETION_MAX = Math.max(1, SystemProperties.getInteger(Util.class.getName() + ".maxFileDeletionRetries", 3).intValue());
+    static int DELETION_MAX = Math.max(1, SystemProperties.getInteger(Util.class.getName() + ".maxFileDeletionRetries", 3));
 
     /**
      * The time (in milliseconds) that we will wait between attempts to
@@ -1581,7 +1581,7 @@ public class Util {
      * between attempts.
      */
     @Restricted(value = NoExternalUse.class)
-    static int WAIT_BETWEEN_DELETION_RETRIES = SystemProperties.getInteger(Util.class.getName() + ".deletionRetryWait", 100).intValue();
+    static int WAIT_BETWEEN_DELETION_RETRIES = SystemProperties.getInteger(Util.class.getName() + ".deletionRetryWait", 100);
 
     /**
      * If this flag is set to true then we will request a garbage collection
diff --git a/core/src/main/java/hudson/model/Job.java b/core/src/main/java/hudson/model/Job.java
index 4b149034bd825bf448e8b6aad5416a8afd748b12..f8510221c60af62c75598da8f8cd0ce4ab83b112 100644
--- a/core/src/main/java/hudson/model/Job.java
+++ b/core/src/main/java/hudson/model/Job.java
@@ -1214,7 +1214,7 @@ public abstract class Job<JobT extends Job<JobT, RunT>, RunT extends Run<JobT, R
         if (cachedBuildHealthReportsBuildNumber != null
                 && cachedBuildHealthReports != null
                 && lastBuild != null
-                && cachedBuildHealthReportsBuildNumber.intValue() == lastBuild
+                && cachedBuildHealthReportsBuildNumber == lastBuild
                         .getNumber()) {
             reports.addAll(cachedBuildHealthReports);
         } else if (lastBuild != null) {
diff --git a/core/src/main/java/hudson/model/ParametersAction.java b/core/src/main/java/hudson/model/ParametersAction.java
index 72643f5afd74bf4af390640f495d7348ed2fb1de..ccf6f4eb908bafc72d5517dd8e6add49ae9850ee 100644
--- a/core/src/main/java/hudson/model/ParametersAction.java
+++ b/core/src/main/java/hudson/model/ParametersAction.java
@@ -320,7 +320,7 @@ public class ParametersAction implements RunAction2, Iterable<ParameterValue>, Q
         }
 
         Boolean shouldKeepFlag = SystemProperties.optBoolean(KEEP_UNDEFINED_PARAMETERS_SYSTEM_PROPERTY_NAME);
-        if (shouldKeepFlag != null && shouldKeepFlag.booleanValue()) {
+        if (shouldKeepFlag != null && shouldKeepFlag) {
             return parameters;
         }