diff --git a/src/java/org/apache/poi/sl/usermodel/AutoShape.java b/src/java/org/apache/poi/sl/usermodel/AutoShape.java
index bea050213..5a77bdae4 100644
--- a/src/java/org/apache/poi/sl/usermodel/AutoShape.java
+++ b/src/java/org/apache/poi/sl/usermodel/AutoShape.java
@@ -19,6 +19,6 @@ package org.apache.poi.sl.usermodel;
 
 public interface AutoShape<
     S extends Shape<S,P>,
-    P extends TextParagraph<S,P,? extends TextRun>
+    P extends TextParagraph<S,P,?>
 > extends TextShape<S,P> {
 }
diff --git a/src/java/org/apache/poi/sl/usermodel/Background.java b/src/java/org/apache/poi/sl/usermodel/Background.java
index 879879a20..64f3b36a5 100644
--- a/src/java/org/apache/poi/sl/usermodel/Background.java
+++ b/src/java/org/apache/poi/sl/usermodel/Background.java
@@ -19,7 +19,7 @@ package org.apache.poi.sl.usermodel;
 
 public interface Background<
     S extends Shape<S,P>,
-    P extends TextParagraph<S,P,? extends TextRun>
+    P extends TextParagraph<S,P,?>
 > extends Shape<S,P> {
     FillStyle getFillStyle();
 }
diff --git a/src/java/org/apache/poi/sl/usermodel/ConnectorShape.java b/src/java/org/apache/poi/sl/usermodel/ConnectorShape.java
index 8d356b655..39e34d29e 100644
--- a/src/java/org/apache/poi/sl/usermodel/ConnectorShape.java
+++ b/src/java/org/apache/poi/sl/usermodel/ConnectorShape.java
@@ -19,7 +19,7 @@ package org.apache.poi.sl.usermodel;
 
 public interface ConnectorShape<
     S extends Shape<S,P>,
-    P extends TextParagraph<S,P,? extends TextRun>
+    P extends TextParagraph<S,P,?>
 > extends SimpleShape<S,P> {
 
 }
diff --git a/src/java/org/apache/poi/sl/usermodel/FreeformShape.java b/src/java/org/apache/poi/sl/usermodel/FreeformShape.java
index 19b5d313f..ca9a8d30f 100644
--- a/src/java/org/apache/poi/sl/usermodel/FreeformShape.java
+++ b/src/java/org/apache/poi/sl/usermodel/FreeformShape.java
@@ -21,7 +21,7 @@ import java.awt.geom.GeneralPath;
 
 public interface FreeformShape<
     S extends Shape<S,P>,
-    P extends TextParagraph<S,P,? extends TextRun>
+    P extends TextParagraph<S,P,?>
 > extends AutoShape<S,P> {
     /**
      * Gets the shape path.
diff --git a/src/java/org/apache/poi/sl/usermodel/GroupShape.java b/src/java/org/apache/poi/sl/usermodel/GroupShape.java
index 31f5be534..a7545a4d4 100644
--- a/src/java/org/apache/poi/sl/usermodel/GroupShape.java
+++ b/src/java/org/apache/poi/sl/usermodel/GroupShape.java
@@ -21,7 +21,7 @@ import java.awt.geom.Rectangle2D;
 
 public interface GroupShape<
     S extends Shape<S,P>,
-    P extends TextParagraph<S,P,? extends TextRun>
+    P extends TextParagraph<S,P,?>
 > extends Shape<S,P>, ShapeContainer<S,P>, PlaceableShape<S,P> {
 
     /**
diff --git a/src/java/org/apache/poi/sl/usermodel/Line.java b/src/java/org/apache/poi/sl/usermodel/Line.java
index d2c2134e5..e9325c55b 100644
--- a/src/java/org/apache/poi/sl/usermodel/Line.java
+++ b/src/java/org/apache/poi/sl/usermodel/Line.java
@@ -27,7 +27,7 @@ import org.apache.poi.util.Internal;
 @Internal
 public interface Line<
     S extends Shape<S,P>,
-    P extends TextParagraph<S,P,? extends TextRun>
+    P extends TextParagraph<S,P,?>
 > extends AutoShape<S,P> {
 
 }
diff --git a/src/java/org/apache/poi/sl/usermodel/MasterSheet.java b/src/java/org/apache/poi/sl/usermodel/MasterSheet.java
index ac23bc3bb..fdfcf4380 100644
--- a/src/java/org/apache/poi/sl/usermodel/MasterSheet.java
+++ b/src/java/org/apache/poi/sl/usermodel/MasterSheet.java
@@ -19,7 +19,7 @@ package org.apache.poi.sl.usermodel;
 
 public interface MasterSheet<
     S extends Shape<S,P>,
-    P extends TextParagraph<S,P,? extends TextRun>
+    P extends TextParagraph<S,P,?>
 > extends Sheet<S,P> {
 
 }
diff --git a/src/java/org/apache/poi/sl/usermodel/Notes.java b/src/java/org/apache/poi/sl/usermodel/Notes.java
index 377ad24c4..d156e98a7 100644
--- a/src/java/org/apache/poi/sl/usermodel/Notes.java
+++ b/src/java/org/apache/poi/sl/usermodel/Notes.java
@@ -21,7 +21,7 @@ import java.util.List;
 
 public interface Notes<
     S extends Shape<S,P>,
-    P extends TextParagraph<S,P,? extends TextRun>
+    P extends TextParagraph<S,P,?>
 > extends Sheet<S,P> {
 	List<? extends List<P>> getTextParagraphs();
 }
diff --git a/src/java/org/apache/poi/sl/usermodel/PictureShape.java b/src/java/org/apache/poi/sl/usermodel/PictureShape.java
index c7fb62941..671a43946 100644
--- a/src/java/org/apache/poi/sl/usermodel/PictureShape.java
+++ b/src/java/org/apache/poi/sl/usermodel/PictureShape.java
@@ -21,7 +21,7 @@ import java.awt.Insets;
 
 public interface PictureShape<
     S extends Shape<S,P>,
-    P extends TextParagraph<S,P,? extends TextRun>
+    P extends TextParagraph<S,P,?>
 > extends SimpleShape<S,P> {
     /**
      * Returns the picture data for this picture.
diff --git a/src/java/org/apache/poi/sl/usermodel/PlaceableShape.java b/src/java/org/apache/poi/sl/usermodel/PlaceableShape.java
index f434b3cc6..191bad65f 100644
--- a/src/java/org/apache/poi/sl/usermodel/PlaceableShape.java
+++ b/src/java/org/apache/poi/sl/usermodel/PlaceableShape.java
@@ -21,7 +21,7 @@ import java.awt.geom.Rectangle2D;
 
 public interface PlaceableShape<
     S extends Shape<S,P>,
-    P extends TextParagraph<S,P,? extends TextRun>
+    P extends TextParagraph<S,P,?>
 > {
     ShapeContainer<S,P> getParent();
     
diff --git a/src/java/org/apache/poi/sl/usermodel/Shape.java b/src/java/org/apache/poi/sl/usermodel/Shape.java
index 164c40643..13996fa6c 100644
--- a/src/java/org/apache/poi/sl/usermodel/Shape.java
+++ b/src/java/org/apache/poi/sl/usermodel/Shape.java
@@ -20,7 +20,7 @@ package org.apache.poi.sl.usermodel;
 
 public interface Shape<
     S extends Shape<S,P>,
-    P extends TextParagraph<S,P,? extends TextRun>
+    P extends TextParagraph<S,P,?>
 > {
 	ShapeContainer<S,P> getParent();
 	
diff --git a/src/java/org/apache/poi/sl/usermodel/ShapeContainer.java b/src/java/org/apache/poi/sl/usermodel/ShapeContainer.java
index b5c296098..a83d8cae9 100644
--- a/src/java/org/apache/poi/sl/usermodel/ShapeContainer.java
+++ b/src/java/org/apache/poi/sl/usermodel/ShapeContainer.java
@@ -22,7 +22,7 @@ import java.util.List;
 
 public interface ShapeContainer<
     S extends Shape<S,P>,
-    P extends TextParagraph<S,P,? extends TextRun>
+    P extends TextParagraph<S,P,?>
 > extends Iterable<S> {
     /**
      * Returns an list containing all of the elements in this container in proper
diff --git a/src/java/org/apache/poi/sl/usermodel/Sheet.java b/src/java/org/apache/poi/sl/usermodel/Sheet.java
index 923dac378..cd2a6f18c 100644
--- a/src/java/org/apache/poi/sl/usermodel/Sheet.java
+++ b/src/java/org/apache/poi/sl/usermodel/Sheet.java
@@ -25,7 +25,7 @@ import java.awt.Graphics2D;
  */
 public interface Sheet<
     S extends Shape<S,P>,
-    P extends TextParagraph<S,P,? extends TextRun>
+    P extends TextParagraph<S,P,?>
 > extends ShapeContainer<S,P> {
 	SlideShow<S,P> getSlideShow();
 
diff --git a/src/java/org/apache/poi/sl/usermodel/SimpleShape.java b/src/java/org/apache/poi/sl/usermodel/SimpleShape.java
index 92612cf95..95f4590eb 100644
--- a/src/java/org/apache/poi/sl/usermodel/SimpleShape.java
+++ b/src/java/org/apache/poi/sl/usermodel/SimpleShape.java
@@ -23,7 +23,7 @@ import org.apache.poi.sl.draw.geom.IAdjustableShape;
 
 public interface SimpleShape<
     S extends Shape<S,P>,
-    P extends TextParagraph<S,P,? extends TextRun>
+    P extends TextParagraph<S,P,?>
 > extends Shape<S,P>, IAdjustableShape, PlaceableShape<S,P> {
     FillStyle getFillStyle();
     LineDecoration getLineDecoration();
diff --git a/src/java/org/apache/poi/sl/usermodel/Slide.java b/src/java/org/apache/poi/sl/usermodel/Slide.java
index 237e0229b..dae2f42e6 100644
--- a/src/java/org/apache/poi/sl/usermodel/Slide.java
+++ b/src/java/org/apache/poi/sl/usermodel/Slide.java
@@ -19,7 +19,7 @@ package org.apache.poi.sl.usermodel;
 
 public interface Slide<
     S extends Shape<S,P>,
-    P extends TextParagraph<S,P,? extends TextRun>
+    P extends TextParagraph<S,P,?>
 > extends Sheet<S,P> {
     Notes<S,P> getNotes();
     void setNotes(Notes<S,P> notes);
diff --git a/src/java/org/apache/poi/sl/usermodel/SlideShow.java b/src/java/org/apache/poi/sl/usermodel/SlideShow.java
index 2b04327e4..03e63f240 100644
--- a/src/java/org/apache/poi/sl/usermodel/SlideShow.java
+++ b/src/java/org/apache/poi/sl/usermodel/SlideShow.java
@@ -26,7 +26,7 @@ import org.apache.poi.sl.usermodel.PictureData.PictureType;
 
 public interface SlideShow<
     S extends Shape<S,P>,
-    P extends TextParagraph<S,P,? extends TextRun>
+    P extends TextParagraph<S,P,?>
 > {
 	Slide<S,P> createSlide() throws IOException;
 
diff --git a/src/java/org/apache/poi/sl/usermodel/TableCell.java b/src/java/org/apache/poi/sl/usermodel/TableCell.java
index 30cb2da37..278573bab 100644
--- a/src/java/org/apache/poi/sl/usermodel/TableCell.java
+++ b/src/java/org/apache/poi/sl/usermodel/TableCell.java
@@ -19,7 +19,7 @@ package org.apache.poi.sl.usermodel;
 
 public interface TableCell<
     S extends Shape<S,P>,
-    P extends TextParagraph<S,P,? extends TextRun>
+    P extends TextParagraph<S,P,?>
 > extends TextShape<S,P> {
 
 }
diff --git a/src/java/org/apache/poi/sl/usermodel/TableShape.java b/src/java/org/apache/poi/sl/usermodel/TableShape.java
index 2ac2881d6..29342e7d9 100644
--- a/src/java/org/apache/poi/sl/usermodel/TableShape.java
+++ b/src/java/org/apache/poi/sl/usermodel/TableShape.java
@@ -19,7 +19,7 @@ package org.apache.poi.sl.usermodel;
 
 public interface TableShape<
     S extends Shape<S,P>,
-    P extends TextParagraph<S,P,? extends TextRun>
+    P extends TextParagraph<S,P,?>
 > extends Shape<S,P>, PlaceableShape<S,P> {
     // to be defined ...
 }
diff --git a/src/java/org/apache/poi/sl/usermodel/TextBox.java b/src/java/org/apache/poi/sl/usermodel/TextBox.java
index 94fd4de40..8fa997c89 100644
--- a/src/java/org/apache/poi/sl/usermodel/TextBox.java
+++ b/src/java/org/apache/poi/sl/usermodel/TextBox.java
@@ -19,6 +19,6 @@ package org.apache.poi.sl.usermodel;
 
 public interface TextBox<
     S extends Shape<S,P>,
-    P extends TextParagraph<S,P,? extends TextRun>
+    P extends TextParagraph<S,P,?>
 > extends AutoShape<S,P> {
 }
diff --git a/src/java/org/apache/poi/sl/usermodel/TextShape.java b/src/java/org/apache/poi/sl/usermodel/TextShape.java
index 5f55a1dc4..f487c108a 100644
--- a/src/java/org/apache/poi/sl/usermodel/TextShape.java
+++ b/src/java/org/apache/poi/sl/usermodel/TextShape.java
@@ -21,7 +21,7 @@ import java.util.List;
 
 public interface TextShape<
     S extends Shape<S,P>,
-    P extends TextParagraph<S,P,? extends TextRun>
+    P extends TextParagraph<S,P,?>
 > extends SimpleShape<S,P>, Iterable<P>  {
     /**
      * Vertical Text Types
@@ -93,7 +93,7 @@ public interface TextShape<
     /**
      * @return the TextParagraphs for this text box
      */
-    List<? extends TextParagraph<S,P,? extends TextRun>> getTextParagraphs();
+    List<? extends TextParagraph<S,P,?>> getTextParagraphs();
 
     /**
      * @return text shape margin