--- a/src/luan/LuanTable.java	Wed Aug 02 17:37:59 2017 -0600
+++ b/src/luan/LuanTable.java	Wed Aug 02 19:00:24 2017 -0600
@@ -276,29 +276,29 @@
 		return list==null ? 0 : list.size();
 	}
 
-	public Iterable<Map.Entry<Object,Object>> iterable(LuanState luan) throws LuanException {
-		final Iterator<Map.Entry<Object,Object>> iter = iterator(luan);
-		return new Iterable<Map.Entry<Object,Object>>() {
-			public Iterator<Map.Entry<Object,Object>> iterator() {
+	public Iterable<Map.Entry> iterable(LuanState luan) throws LuanException {
+		final Iterator<Map.Entry> iter = iterator(luan);
+		return new Iterable<Map.Entry>() {
+			public Iterator<Map.Entry> iterator() {
 				return iter;
 			}
 		};
 	}
 
-	public Iterable<Map.Entry<Object,Object>> rawIterable() throws LuanException {
-		final Iterator<Map.Entry<Object,Object>> iter = rawIterator();
-		return new Iterable<Map.Entry<Object,Object>>() {
-			public Iterator<Map.Entry<Object,Object>> iterator() {
+	public Iterable<Map.Entry> rawIterable() throws LuanException {
+		final Iterator<Map.Entry> iter = rawIterator();
+		return new Iterable<Map.Entry>() {
+			public Iterator<Map.Entry> iterator() {
 				return iter;
 			}
 		};
 	}
 
-	public Iterator<Map.Entry<Object,Object>> iterator(final LuanState luan) throws LuanException {
+	public Iterator<Map.Entry> iterator(final LuanState luan) throws LuanException {
 		if( getHandler("__pairs") == null )
 			return rawIterator();
 		final LuanFunction fn = pairs(luan);
-		return new Iterator<Map.Entry<Object,Object>>() {
+		return new Iterator<Map.Entry>() {
 			private Map.Entry<Object,Object> next = getNext();
 
 			private Map.Entry<Object,Object> getNext() {
@@ -348,7 +348,7 @@
 
 	private LuanFunction rawPairs() {
 		return new LuanFunction() {
-			final Iterator<Map.Entry<Object,Object>> iter = rawIterator();
+			final Iterator<Map.Entry> iter = rawIterator();
 
 			@Override public Object[] call(LuanState luan,Object[] args) {
 				if( !iter.hasNext() )
@@ -359,17 +359,17 @@
 		};
 	}
 
-	public Iterator<Map.Entry<Object,Object>> rawIterator() {
+	public Iterator<Map.Entry> rawIterator() {
 		check();
 		if( list == null ) {
 			if( map == null )
-				return Collections.<Map.Entry<Object,Object>>emptyList().iterator();
+				return Collections.<Map.Entry>emptyList().iterator();
 			return map.entrySet().iterator();
 		}
 		if( map == null )
 			return listIterator();
-		return new Iterator<Map.Entry<Object,Object>>() {
-			Iterator<Map.Entry<Object,Object>> iter = listIterator();
+		return new Iterator<Map.Entry>() {
+			Iterator<Map.Entry> iter = listIterator();
 			boolean isList = true;
 
 			public boolean hasNext() {
@@ -392,11 +392,11 @@
 		};
 	}
 
-	private Iterator<Map.Entry<Object,Object>> listIterator() {
+	private Iterator<Map.Entry> listIterator() {
 		if( list == null )
-			return Collections.<Map.Entry<Object,Object>>emptyList().iterator();
+			return Collections.<Map.Entry>emptyList().iterator();
 		final ListIterator iter = list.listIterator();
-		return new Iterator<Map.Entry<Object,Object>>() {
+		return new Iterator<Map.Entry>() {
 
 			public boolean hasNext() {
 				return iter.hasNext();