Index: api/src/main/java/javax/jdo/query/ComparableExpression.java
===================================================================
--- api/src/main/java/javax/jdo/query/ComparableExpression.java	(revision 1833246)
+++ api/src/main/java/javax/jdo/query/ComparableExpression.java	(working copy)
@@ -28,7 +28,7 @@
      * @param expr Other expression
      * @return Whether this is less than the other
      */
-    BooleanExpression lt(ComparableExpression expr);
+    BooleanExpression lt(ComparableExpression<T> expr);
 
     /**
      * Method returning whether this expression is less than the literal.
@@ -42,7 +42,7 @@
      * @param expr Other expression
      * @return Whether this is less than or equal the other
      */
-    BooleanExpression lteq(ComparableExpression expr);
+    BooleanExpression lteq(ComparableExpression<T> expr);
 
     /**
      * Method returning whether this expression is less than or equal the literal.
@@ -56,7 +56,7 @@
      * @param expr Other expression
      * @return Whether this is greater than the other
      */
-    BooleanExpression gt(ComparableExpression expr);
+    BooleanExpression gt(ComparableExpression<T> expr);
 
     /**
      * Method returning whether this expression is greater than the literal.
@@ -70,7 +70,7 @@
      * @param expr Other expression
      * @return Whether this is greater than or equal to the other
      */
-    BooleanExpression gteq(ComparableExpression expr);
+    BooleanExpression gteq(ComparableExpression<T> expr);
 
     /**
      * Method returning whether this expression is greater than or equal the literal.
@@ -83,23 +83,24 @@
      * Method to return a numeric expression representing the aggregated minimum of this expression.
      * @return Numeric expression for the minimum
      */
-    NumericExpression min();
+    NumericExpression<T> min();
 
     /**
      * Method to return a numeric expression representing the aggregated maximum of this expression.
      * @return Numeric expression for the maximum
      */
-    NumericExpression max();
+    NumericExpression<T> max();
 
     /**
      * Method to return an order expression for this expression in ascending order.
      * @return The order expression
      */
-    OrderExpression asc();
+    OrderExpression<T> asc();
 
     /**
      * Method to return an order expression for this expression in descending order.
      * @return The order expression
      */
-    OrderExpression desc();
-}
\ No newline at end of file
+    OrderExpression<T> desc();
+}
+
Index: api/src/main/java/javax/jdo/query/NumericExpression.java
===================================================================
--- api/src/main/java/javax/jdo/query/NumericExpression.java	(revision 1833246)
+++ api/src/main/java/javax/jdo/query/NumericExpression.java	(working copy)
@@ -109,7 +109,7 @@
      * Method to return a numeric expression representing the aggregated average of this expression.
      * @return Numeric expression for the average
      */
-    NumericExpression avg();
+    NumericExpression<Double> avg();
 
     /**
      * Method to return a numeric expression representing the aggregated sum of this expression.
@@ -209,4 +209,4 @@
      * @return Bitwise XOR expression
      */
     NumericExpression bXor(NumericExpression bitExpr);
-}
\ No newline at end of file
+}