diff --git a/xwiki-rendering-api/src/main/java/org/xwiki/rendering/listener/chaining/ListenerChain.java b/xwiki-rendering-api/src/main/java/org/xwiki/rendering/listener/chaining/ListenerChain.java
index 23493bec3c..7d614d42cb 100644
--- a/xwiki-rendering-api/src/main/java/org/xwiki/rendering/listener/chaining/ListenerChain.java
+++ b/xwiki-rendering-api/src/main/java/org/xwiki/rendering/listener/chaining/ListenerChain.java
@@ -70,7 +70,7 @@ public void addListener(ChainingListener listener)
     public void removeListener(Class<? extends ChainingListener> listenerClass)
     {
         Deque<ChainingListener> stack = this.listeners.get(listenerClass);
-        if (stack.size() > 0) {
+        if (!stack.isEmpty()) {
             stack.pop();
         }
         if (stack.isEmpty()) {
diff --git a/xwiki-rendering-wikimodel/src/main/java/org/xwiki/rendering/wikimodel/xhtml/PrintInlineListener.java b/xwiki-rendering-wikimodel/src/main/java/org/xwiki/rendering/wikimodel/xhtml/PrintInlineListener.java
index e09ee63f42..642f627745 100644
--- a/xwiki-rendering-wikimodel/src/main/java/org/xwiki/rendering/wikimodel/xhtml/PrintInlineListener.java
+++ b/xwiki-rendering-wikimodel/src/main/java/org/xwiki/rendering/wikimodel/xhtml/PrintInlineListener.java
@@ -53,7 +53,7 @@ public PrintInlineListener(IWikiPrinter printer, boolean supportImage, boolean s
     public void beginFormat(WikiFormat format)
     {
         print(format.getTags(true));
-        if (format.getParams().size() > 0) {
+        if (!format.getParams().isEmpty()) {
             print("<span class='wikimodel-parameters'" + format.getParams() + ">");
         }
     }
@@ -75,7 +75,7 @@ public void beginPropertyInline(String str)
     @Override
     public void endFormat(WikiFormat format)
     {
-        if (format.getParams().size() > 0) {
+        if (!format.getParams().isEmpty()) {
             print("</span>");
         }
         print(format.getTags(false));