diff --git a/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/target/TargetDefinition.java b/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/target/TargetDefinition.java
index 5e9e3caf30..f0448caf31 100644
--- a/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/target/TargetDefinition.java
+++ b/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/target/TargetDefinition.java
@@ -1270,15 +1270,12 @@ private void updateIUContainerElements(Element containersElement, List<Element>
 			for (int i = 0; i < nodes.getLength(); i++) {
 				Node node = nodes.item(i);
 				if (node instanceof Element) {
-					if (repoURL == null
-							&& node.getNodeName().equalsIgnoreCase(TargetDefinitionPersistenceHelper.REPOSITORY)) {
+					String nodeName = node.getNodeName();
+					if (repoURL == null && nodeName.equalsIgnoreCase(TargetDefinitionPersistenceHelper.REPOSITORY)) {
 						repoURL = ((Element) node).getAttribute(TargetDefinitionPersistenceHelper.LOCATION);
-						if (!oldContainersByRepo.containsKey(repoURL)) {
-							oldContainersByRepo.put(repoURL, new ArrayList<>());
-						}
+						oldContainersByRepo.putIfAbsent(repoURL, new ArrayList<>());
 						oldContainersByRepo.get(repoURL).add(container);
-					} else if (node.getNodeName()
-							.equalsIgnoreCase(TargetDefinitionPersistenceHelper.INSTALLABLE_UNIT)) {
+					} else if (nodeName.equalsIgnoreCase(TargetDefinitionPersistenceHelper.INSTALLABLE_UNIT)) {
 						units.add((Element) node);
 					}
 				}
@@ -1299,11 +1296,10 @@ private void updateIUContainerElements(Element containersElement, List<Element>
 			for (int i = 0; i < nodes.getLength(); i++) {
 				Node node = nodes.item(i);
 				if (node instanceof Element) {
-					if (repoURL == null
-							&& node.getNodeName().equalsIgnoreCase(TargetDefinitionPersistenceHelper.REPOSITORY)) {
+					String nodeName = node.getNodeName();
+					if (repoURL == null && nodeName.equalsIgnoreCase(TargetDefinitionPersistenceHelper.REPOSITORY)) {
 						repoURL = ((Element) node).getAttribute(TargetDefinitionPersistenceHelper.LOCATION);
-					} else if (node.getNodeName()
-							.equalsIgnoreCase(TargetDefinitionPersistenceHelper.INSTALLABLE_UNIT)) {
+					} else if (nodeName.equalsIgnoreCase(TargetDefinitionPersistenceHelper.INSTALLABLE_UNIT)) {
 						units.add((Element) node);
 					}
 				}