Merge pull request #857 from sjakobi/ghc-head-update-3

Update ghc-head

1 files changed, 377 insertions, 377 deletions

diff --git a/html-test/ref/TypeFamilies.html b/html-test/ref/TypeFamilies.html
index dcb5a92a..2195a05a 100644
--- a/html-test/ref/TypeFamilies.html
+++ b/html-test/ref/TypeFamilies.html
@@ -110,9 +110,7 @@
 	      >data family</span
 	      > <a href="#"
 	      >Bat</a
-	      > (a :: k) :: <a href="#"
-	      >*</a
-	      ></li
+	      > (a :: k) :: *</li
 	    ><li class="src short"
 	    ><span class="keyword"
 	      >class</span
@@ -126,17 +124,13 @@
 		  >data</span
 		  > <a href="#"
 		  >AssocD</a
-		  > a :: <a href="#"
-		  >*</a
-		  ></li
+		  > a :: *</li
 		><li
 		><span class="keyword"
 		  >type</span
 		  > <a href="#"
 		  >AssocT</a
-		  > a :: <a href="#"
-		  >*</a
-		  ></li
+		  > a :: *</li
 		></ul
 	      ></li
 	    ><li class="src short"
@@ -224,13 +218,11 @@
 		  ><span class="inst-left"
 		    ><span class="instance details-toggle-control details-toggle" data-details-id="i:id:X:-62--60-:1"
 		      ></span
-		      > <a href="#"
-		      >(&gt;&lt;)</a
-		      > <a href="#"
-		      >X</a
-		      > <a href="#"
+		      > <a href="#" title="TypeFamilies"
 		      >XX</a
-		      > <a href="#"
+		      > <a href="#" title="TypeFamilies"
+		      >&gt;&lt;</a
+		      > <a href="#" title="TypeFamilies"
 		      >XXX</a
 		      ></span
 		    > <a href="#" class="selflink"
@@ -244,6 +236,10 @@
 		  ><details id="i:id:X:-62--60-:1"
 		    ><summary class="hide-when-js-enabled"
 		      >Instance details</summary
+		      ><p
+		      >Defined in <a href="#"
+			>TypeFamilies</a
+			></p
 		      ></details
 		    ></td
 		  ></tr
@@ -252,11 +248,9 @@
 		  ><span class="inst-left"
 		    ><span class="instance details-toggle-control details-toggle" data-details-id="i:id:X:Assoc:2"
 		      ></span
-		      > <a href="#"
+		      > <a href="#" title="TypeFamilies"
 		      >Assoc</a
-		      > <a href="#"
-		      >*</a
-		      > <a href="#"
+		      > <a href="#" title="TypeFamilies"
 		      >X</a
 		      ></span
 		    > <a href="#" class="selflink"
@@ -272,35 +266,31 @@
 		  ><details id="i:id:X:Assoc:2"
 		    ><summary class="hide-when-js-enabled"
 		      >Instance details</summary
-		      ><div class="subs associated-types"
+		      ><p
+		      >Defined in <a href="#"
+			>TypeFamilies</a
+			></p
+		      > <div class="subs associated-types"
 		      ><p class="caption"
 			>Associated Types</p
 			><p class="src"
 			><span class="keyword"
 			  >data</span
-			  > <a href="#"
+			  > <a href="#" title="TypeFamilies"
 			  >AssocD</a
-			  > <a href="#"
+			  > <a href="#" title="TypeFamilies"
 			  >X</a
-			  > (a :: <a href="#"
-			  >X</a
-			  >) :: <a href="#"
-			  >*</a
-			  > <a href="#" class="selflink"
+			  > :: * <a href="#" class="selflink"
 			  >#</a
 			  ></p
 			><p class="src"
 			><span class="keyword"
 			  >type</span
-			  > <a href="#"
+			  > <a href="#" title="TypeFamilies"
 			  >AssocT</a
-			  > <a href="#"
-			  >X</a
-			  > (a :: <a href="#"
+			  > <a href="#" title="TypeFamilies"
 			  >X</a
-			  >) :: <a href="#"
-			  >*</a
-			  > <a href="#" class="selflink"
+			  > :: * <a href="#" class="selflink"
 			  >#</a
 			  ></p
 			></div
@@ -312,11 +302,9 @@
 		  ><span class="inst-left"
 		    ><span class="instance details-toggle-control details-toggle" data-details-id="i:id:X:Test:3"
 		      ></span
-		      > <a href="#"
+		      > <a href="#" title="TypeFamilies"
 		      >Test</a
-		      > <a href="#"
-		      >*</a
-		      > <a href="#"
+		      > <a href="#" title="TypeFamilies"
 		      >X</a
 		      ></span
 		    > <a href="#" class="selflink"
@@ -332,6 +320,10 @@
 		  ><details id="i:id:X:Test:3"
 		    ><summary class="hide-when-js-enabled"
 		      >Instance details</summary
+		      ><p
+		      >Defined in <a href="#"
+			>TypeFamilies</a
+			></p
 		      ></details
 		    ></td
 		  ></tr
@@ -342,9 +334,9 @@
 		      ></span
 		      > <span class="keyword"
 		      >type</span
-		      > <a href="#"
+		      > <a href="#" title="TypeFamilies2"
 		      >Foo</a
-		      > <a href="#"
+		      > <a href="#" title="TypeFamilies"
 		      >X</a
 		      ></span
 		    > <a href="#" class="selflink"
@@ -358,14 +350,18 @@
 		  ><details id="i:id:X:Foo:4"
 		    ><summary class="hide-when-js-enabled"
 		      >Instance details</summary
-		      ><div class="src"
+		      ><p
+		      >Defined in <a href="#"
+			>TypeFamilies</a
+			></p
+		      > <div class="src"
 		      ><span class="keyword"
 			>type</span
-			> <a href="#"
+			> <a href="#" title="TypeFamilies2"
 			>Foo</a
-			> <a href="#"
+			> <a href="#" title="TypeFamilies"
 			>X</a
-			> = <a href="#"
+			> = <a href="#" title="TypeFamilies"
 			>Y</a
 			></div
 		      ></details
@@ -378,13 +374,11 @@
 		      ></span
 		      > <span class="keyword"
 		      >type</span
-		      > <a href="#"
-		      >(&lt;&gt;)</a
-		      > <a href="#"
-		      >X</a
-		      > <a href="#"
+		      > <a href="#" title="TypeFamilies"
 		      >XXX</a
-		      > <a href="#"
+		      > <a href="#" title="TypeFamilies"
+		      >&lt;&gt;</a
+		      > <a href="#" title="TypeFamilies"
 		      >XX</a
 		      ></span
 		    > <a href="#" class="selflink"
@@ -398,18 +392,20 @@
 		  ><details id="i:id:X:-60--62-:5"
 		    ><summary class="hide-when-js-enabled"
 		      >Instance details</summary
-		      ><div class="src"
+		      ><p
+		      >Defined in <a href="#"
+			>TypeFamilies</a
+			></p
+		      > <div class="src"
 		      ><span class="keyword"
 			>type</span
-			> <a href="#"
-			>(&lt;&gt;)</a
-			> <a href="#"
-			>X</a
-			> <a href="#"
+			> <a href="#" title="TypeFamilies"
 			>XXX</a
-			> <a href="#"
+			> <a href="#" title="TypeFamilies"
+			>&lt;&gt;</a
+			> <a href="#" title="TypeFamilies"
 			>XX</a
-			> = <a href="#"
+			> = <a href="#" title="TypeFamilies"
 			>X</a
 			></div
 		      ></details
@@ -422,11 +418,9 @@
 		      ></span
 		      > <span class="keyword"
 		      >data</span
-		      > <a href="#"
+		      > <a href="#" title="TypeFamilies"
 		      >AssocD</a
-		      > <a href="#"
-		      >*</a
-		      > <a href="#"
+		      > <a href="#" title="TypeFamilies"
 		      >X</a
 		      ></span
 		    > <a href="#" class="selflink"
@@ -440,14 +434,16 @@
 		  ><details id="i:id:X:AssocD:6"
 		    ><summary class="hide-when-js-enabled"
 		      >Instance details</summary
-		      ><div class="src"
+		      ><p
+		      >Defined in <a href="#"
+			>TypeFamilies</a
+			></p
+		      > <div class="src"
 		      ><span class="keyword"
 			>data</span
-			> <a href="#"
+			> <a href="#" title="TypeFamilies"
 			>AssocD</a
-			> <a href="#"
-			>*</a
-			> <a href="#"
+			> <a href="#" title="TypeFamilies"
 			>X</a
 			> = <a id="v:AssocX" class="def"
 			>AssocX</a
@@ -462,11 +458,9 @@
 		      ></span
 		      > <span class="keyword"
 		      >type</span
-		      > <a href="#"
+		      > <a href="#" title="TypeFamilies"
 		      >AssocT</a
-		      > <a href="#"
-		      >*</a
-		      > <a href="#"
+		      > <a href="#" title="TypeFamilies"
 		      >X</a
 		      ></span
 		    > <a href="#" class="selflink"
@@ -480,22 +474,22 @@
 		  ><details id="i:id:X:AssocT:7"
 		    ><summary class="hide-when-js-enabled"
 		      >Instance details</summary
-		      ><div class="src"
+		      ><p
+		      >Defined in <a href="#"
+			>TypeFamilies</a
+			></p
+		      > <div class="src"
 		      ><span class="keyword"
 			>type</span
-			> <a href="#"
+			> <a href="#" title="TypeFamilies"
 			>AssocT</a
-			> <a href="#"
-			>*</a
-			> <a href="#"
+			> <a href="#" title="TypeFamilies"
 			>X</a
-			> = <a href="#"
+			> = (<a href="#" title="TypeFamilies"
 			>Foo</a
-			> <a href="#"
-			>*</a
-			> <a href="#"
+			> <a href="#" title="TypeFamilies"
 			>X</a
-			></div
+			> :: *)</div
 		      ></details
 		    ></td
 		  ></tr
@@ -506,11 +500,9 @@
 		      ></span
 		      > <span class="keyword"
 		      >data</span
-		      > <a href="#"
+		      > <a href="#" title="TypeFamilies"
 		      >Bat</a
-		      > <a href="#"
-		      >*</a
-		      > <a href="#"
+		      > <a href="#" title="TypeFamilies"
 		      >X</a
 		      ></span
 		    > <a href="#" class="selflink"
@@ -526,20 +518,22 @@
 		  ><details id="i:id:X:Bat:8"
 		    ><summary class="hide-when-js-enabled"
 		      >Instance details</summary
-		      ><div class="src"
+		      ><p
+		      >Defined in <a href="#"
+			>TypeFamilies</a
+			></p
+		      > <div class="src"
 		      ><span class="keyword"
 			>data</span
-			> <a href="#"
+			> <a href="#" title="TypeFamilies"
 			>Bat</a
-			> <a href="#"
-			>*</a
-			> <a href="#"
+			> <a href="#" title="TypeFamilies"
 			>X</a
 			> <ul class="inst"
 			><li class="inst"
 			  >= <a id="v:BatX" class="def"
 			    >BatX</a
-			    > <a href="#"
+			    > <a href="#" title="TypeFamilies"
 			    >X</a
 			    ></li
 			  ><li class="inst"
@@ -549,13 +543,13 @@
 			    ><li
 			      ><a id="v:aaa" class="def"
 				>aaa</a
-				> :: <a href="#"
+				> :: <a href="#" title="TypeFamilies"
 				>X</a
 				></li
 			      ><li
 			      ><a id="v:bbb" class="def"
 				>bbb</a
-				> :: <a href="#"
+				> :: <a href="#" title="TypeFamilies"
 				>Y</a
 				></li
 			      ></ul
@@ -572,11 +566,9 @@
 		      ></span
 		      > <span class="keyword"
 		      >type</span
-		      > <a href="#"
+		      > <a href="#" title="TypeFamilies"
 		      >Foo</a
-		      > <a href="#"
-		      >*</a
-		      > <a href="#"
+		      > <a href="#" title="TypeFamilies"
 		      >X</a
 		      ></span
 		    > <a href="#" class="selflink"
@@ -590,16 +582,18 @@
 		  ><details id="i:id:X:Foo:9"
 		    ><summary class="hide-when-js-enabled"
 		      >Instance details</summary
-		      ><div class="src"
+		      ><p
+		      >Defined in <a href="#"
+			>TypeFamilies</a
+			></p
+		      > <div class="src"
 		      ><span class="keyword"
 			>type</span
-			> <a href="#"
+			> <a href="#" title="TypeFamilies"
 			>Foo</a
-			> <a href="#"
-			>*</a
-			> <a href="#"
+			> <a href="#" title="TypeFamilies"
 			>X</a
-			> = <a href="#"
+			> = <a href="#" title="TypeFamilies"
 			>Y</a
 			></div
 		      ></details
@@ -612,13 +606,11 @@
 		      ></span
 		      > <span class="keyword"
 		      >type</span
-		      > <a href="#"
-		      >(&lt;&gt;)</a
-		      > <a href="#"
-		      >*</a
-		      > <a href="#"
+		      > <a href="#" title="TypeFamilies"
 		      >X</a
-		      > a</span
+		      > <a href="#" title="TypeFamilies"
+		      >&lt;&gt;</a
+		      > (a :: *)</span
 		    > <a href="#" class="selflink"
 		    >#</a
 		    ></td
@@ -630,16 +622,18 @@
 		  ><details id="i:id:X:-60--62-:10"
 		    ><summary class="hide-when-js-enabled"
 		      >Instance details</summary
-		      ><div class="src"
+		      ><p
+		      >Defined in <a href="#"
+			>TypeFamilies</a
+			></p
+		      > <div class="src"
 		      ><span class="keyword"
 			>type</span
-			> <a href="#"
-			>(&lt;&gt;)</a
-			> <a href="#"
-			>*</a
-			> <a href="#"
+			> <a href="#" title="TypeFamilies"
 			>X</a
-			> a = <a href="#"
+			> <a href="#" title="TypeFamilies"
+			>&lt;&gt;</a
+			> (a :: *) = <a href="#" title="TypeFamilies"
 			>X</a
 			></div
 		      ></details
@@ -672,11 +666,9 @@
 		  ><span class="inst-left"
 		    ><span class="instance details-toggle-control details-toggle" data-details-id="i:id:Y:Assoc:1"
 		      ></span
-		      > <a href="#"
+		      > <a href="#" title="TypeFamilies"
 		      >Assoc</a
-		      > <a href="#"
-		      >*</a
-		      > <a href="#"
+		      > <a href="#" title="TypeFamilies"
 		      >Y</a
 		      ></span
 		    > <a href="#" class="selflink"
@@ -692,35 +684,31 @@
 		  ><details id="i:id:Y:Assoc:1"
 		    ><summary class="hide-when-js-enabled"
 		      >Instance details</summary
-		      ><div class="subs associated-types"
+		      ><p
+		      >Defined in <a href="#"
+			>TypeFamilies</a
+			></p
+		      > <div class="subs associated-types"
 		      ><p class="caption"
 			>Associated Types</p
 			><p class="src"
 			><span class="keyword"
 			  >data</span
-			  > <a href="#"
+			  > <a href="#" title="TypeFamilies"
 			  >AssocD</a
-			  > <a href="#"
-			  >Y</a
-			  > (a :: <a href="#"
+			  > <a href="#" title="TypeFamilies"
 			  >Y</a
-			  >) :: <a href="#"
-			  >*</a
-			  > <a href="#" class="selflink"
+			  > :: * <a href="#" class="selflink"
 			  >#</a
 			  ></p
 			><p class="src"
 			><span class="keyword"
 			  >type</span
-			  > <a href="#"
+			  > <a href="#" title="TypeFamilies"
 			  >AssocT</a
-			  > <a href="#"
+			  > <a href="#" title="TypeFamilies"
 			  >Y</a
-			  > (a :: <a href="#"
-			  >Y</a
-			  >) :: <a href="#"
-			  >*</a
-			  > <a href="#" class="selflink"
+			  > :: * <a href="#" class="selflink"
 			  >#</a
 			  ></p
 			></div
@@ -732,11 +720,9 @@
 		  ><span class="inst-left"
 		    ><span class="instance details-toggle-control details-toggle" data-details-id="i:id:Y:Test:2"
 		      ></span
-		      > <a href="#"
+		      > <a href="#" title="TypeFamilies"
 		      >Test</a
-		      > <a href="#"
-		      >*</a
-		      > <a href="#"
+		      > <a href="#" title="TypeFamilies"
 		      >Y</a
 		      ></span
 		    > <a href="#" class="selflink"
@@ -752,6 +738,10 @@
 		  ><details id="i:id:Y:Test:2"
 		    ><summary class="hide-when-js-enabled"
 		      >Instance details</summary
+		      ><p
+		      >Defined in <a href="#"
+			>TypeFamilies</a
+			></p
 		      ></details
 		    ></td
 		  ></tr
@@ -762,9 +752,9 @@
 		      ></span
 		      > <span class="keyword"
 		      >data</span
-		      > <a href="#"
+		      > <a href="#" title="TypeFamilies2"
 		      >Bar</a
-		      > <a href="#"
+		      > <a href="#" title="TypeFamilies"
 		      >Y</a
 		      ></span
 		    > <a href="#" class="selflink"
@@ -778,12 +768,16 @@
 		  ><details id="i:id:Y:Bar:3"
 		    ><summary class="hide-when-js-enabled"
 		      >Instance details</summary
-		      ><div class="src"
+		      ><p
+		      >Defined in <a href="#"
+			>TypeFamilies</a
+			></p
+		      > <div class="src"
 		      ><span class="keyword"
 			>data</span
-			> <a href="#"
+			> <a href="#" title="TypeFamilies2"
 			>Bar</a
-			> <a href="#"
+			> <a href="#" title="TypeFamilies"
 			>Y</a
 			></div
 		      ></details
@@ -796,11 +790,9 @@
 		      ></span
 		      > <span class="keyword"
 		      >data</span
-		      > <a href="#"
+		      > <a href="#" title="TypeFamilies"
 		      >AssocD</a
-		      > <a href="#"
-		      >*</a
-		      > <a href="#"
+		      > <a href="#" title="TypeFamilies"
 		      >Y</a
 		      ></span
 		    > <a href="#" class="selflink"
@@ -814,14 +806,16 @@
 		  ><details id="i:id:Y:AssocD:4"
 		    ><summary class="hide-when-js-enabled"
 		      >Instance details</summary
-		      ><div class="src"
+		      ><p
+		      >Defined in <a href="#"
+			>TypeFamilies</a
+			></p
+		      > <div class="src"
 		      ><span class="keyword"
 			>data</span
-			> <a href="#"
+			> <a href="#" title="TypeFamilies"
 			>AssocD</a
-			> <a href="#"
-			>*</a
-			> <a href="#"
+			> <a href="#" title="TypeFamilies"
 			>Y</a
 			> = <a id="v:AssocY" class="def"
 			>AssocY</a
@@ -836,11 +830,9 @@
 		      ></span
 		      > <span class="keyword"
 		      >type</span
-		      > <a href="#"
+		      > <a href="#" title="TypeFamilies"
 		      >AssocT</a
-		      > <a href="#"
-		      >*</a
-		      > <a href="#"
+		      > <a href="#" title="TypeFamilies"
 		      >Y</a
 		      ></span
 		    > <a href="#" class="selflink"
@@ -854,20 +846,20 @@
 		  ><details id="i:id:Y:AssocT:5"
 		    ><summary class="hide-when-js-enabled"
 		      >Instance details</summary
-		      ><div class="src"
+		      ><p
+		      >Defined in <a href="#"
+			>TypeFamilies</a
+			></p
+		      > <div class="src"
 		      ><span class="keyword"
 			>type</span
-			> <a href="#"
+			> <a href="#" title="TypeFamilies"
 			>AssocT</a
-			> <a href="#"
-			>*</a
-			> <a href="#"
+			> <a href="#" title="TypeFamilies"
 			>Y</a
-			> = <a href="#"
+			> = <a href="#" title="TypeFamilies"
 			>Bat</a
-			> <a href="#"
-			>*</a
-			> <a href="#"
+			> <a href="#" title="TypeFamilies"
 			>Y</a
 			></div
 		      ></details
@@ -880,11 +872,9 @@
 		      ></span
 		      > <span class="keyword"
 		      >data</span
-		      > <a href="#"
+		      > <a href="#" title="TypeFamilies"
 		      >Bat</a
-		      > <a href="#"
-		      >*</a
-		      > <a href="#"
+		      > <a href="#" title="TypeFamilies"
 		      >Y</a
 		      ></span
 		    > <a href="#" class="selflink"
@@ -900,18 +890,20 @@
 		  ><details id="i:id:Y:Bat:6"
 		    ><summary class="hide-when-js-enabled"
 		      >Instance details</summary
-		      ><div class="src"
+		      ><p
+		      >Defined in <a href="#"
+			>TypeFamilies</a
+			></p
+		      > <div class="src"
 		      ><span class="keyword"
 			>data</span
-			> <a href="#"
+			> <a href="#" title="TypeFamilies"
 			>Bat</a
-			> <a href="#"
-			>*</a
-			> <a href="#"
+			> <a href="#" title="TypeFamilies"
 			>Y</a
 			> = <a id="v:BatY" class="def"
 			>BatY</a
-			> <a href="#"
+			> <a href="#" title="TypeFamilies"
 			>Y</a
 			></div
 		      ></details
@@ -924,11 +916,9 @@
 		      ></span
 		      > <span class="keyword"
 		      >type</span
-		      > <a href="#"
+		      > <a href="#" title="TypeFamilies"
 		      >Foo</a
-		      > <a href="#"
-		      >*</a
-		      > <a href="#"
+		      > <a href="#" title="TypeFamilies"
 		      >Y</a
 		      ></span
 		    > <a href="#" class="selflink"
@@ -942,16 +932,18 @@
 		  ><details id="i:id:Y:Foo:7"
 		    ><summary class="hide-when-js-enabled"
 		      >Instance details</summary
-		      ><div class="src"
+		      ><p
+		      >Defined in <a href="#"
+			>TypeFamilies</a
+			></p
+		      > <div class="src"
 		      ><span class="keyword"
 			>type</span
-			> <a href="#"
+			> <a href="#" title="TypeFamilies"
 			>Foo</a
-			> <a href="#"
-			>*</a
-			> <a href="#"
+			> <a href="#" title="TypeFamilies"
 			>Y</a
-			> = <a href="#"
+			> = <a href="#" title="TypeFamilies"
 			>X</a
 			></div
 		      ></details
@@ -964,13 +956,11 @@
 		      ></span
 		      > <span class="keyword"
 		      >type</span
-		      > <a href="#"
-		      >(&lt;&gt;)</a
-		      > <a href="#"
-		      >*</a
-		      > <a href="#"
+		      > <a href="#" title="TypeFamilies"
 		      >Y</a
-		      > a</span
+		      > <a href="#" title="TypeFamilies"
+		      >&lt;&gt;</a
+		      > (a :: *)</span
 		    > <a href="#" class="selflink"
 		    >#</a
 		    ></td
@@ -982,16 +972,18 @@
 		  ><details id="i:id:Y:-60--62-:8"
 		    ><summary class="hide-when-js-enabled"
 		      >Instance details</summary
-		      ><div class="src"
+		      ><p
+		      >Defined in <a href="#"
+			>TypeFamilies</a
+			></p
+		      > <div class="src"
 		      ><span class="keyword"
 			>type</span
-			> <a href="#"
-			>(&lt;&gt;)</a
-			> <a href="#"
-			>*</a
-			> <a href="#"
+			> <a href="#" title="TypeFamilies"
 			>Y</a
-			> a = a</div
+			> <a href="#" title="TypeFamilies"
+			>&lt;&gt;</a
+			> (a :: *) = a</div
 		      ></details
 		    ></td
 		  ></tr
@@ -1046,11 +1038,11 @@
 		      ></span
 		      > <span class="keyword"
 		      >data</span
-		      > <a href="#"
+		      > <a href="#" title="TypeFamilies"
 		      >Bat</a
-		      > <a href="#"
+		      > (z :: <a href="#" title="TypeFamilies"
 		      >Z</a
-		      ></span
+		      >)</span
 		    > <a href="#" class="selflink"
 		    >#</a
 		    ></td
@@ -1064,34 +1056,44 @@
 		  ><details id="i:id:Z:Bat:1"
 		    ><summary class="hide-when-js-enabled"
 		      >Instance details</summary
-		      ><div class="src"
+		      ><p
+		      >Defined in <a href="#"
+			>TypeFamilies</a
+			></p
+		      > <div class="src"
 		      ><span class="keyword"
 			>data</span
-			> <a href="#"
+			> <a href="#" title="TypeFamilies"
 			>Bat</a
-			> <a href="#"
+			> (z :: <a href="#" title="TypeFamilies"
 			>Z</a
-			> <span class="keyword"
+			>) <span class="keyword"
 			>where</span
 			><ul class="inst"
 			><li class="inst"
 			  ><a id="v:BatZ1" class="def"
 			    >BatZ1</a
-			    > :: <a href="#"
-			    >Bat</a
-			    > <a href="#"
+			    > :: <span class="keyword"
+			    >forall</span
+			    > (z :: <a href="#" title="TypeFamilies"
+			    >Z</a
+			    >). <a href="#" title="TypeFamilies"
 			    >Z</a
-			    > <a href="#"
+			    > -&gt; <a href="#" title="TypeFamilies"
+			    >Bat</a
+			    > <a href="#" title="TypeFamilies"
 			    >ZA</a
 			    ></li
 			  ><li class="inst"
 			  ><a id="v:BatZ2" class="def"
 			    >BatZ2</a
-			    > :: <a href="#"
-			    >Bat</a
-			    > <a href="#"
+			    > :: <span class="keyword"
+			    >forall</span
+			    > (z :: <a href="#" title="TypeFamilies"
 			    >Z</a
-			    > <a href="#"
+			    >). {..} -&gt; <a href="#" title="TypeFamilies"
+			    >Bat</a
+			    > <a href="#" title="TypeFamilies"
 			    >ZB</a
 			    ></li
 			  ></ul
@@ -1126,11 +1128,9 @@
 		  ><span class="inst-left"
 		    ><span class="instance details-toggle-control details-toggle" data-details-id="i:ic:Test:Test:1"
 		      ></span
-		      > <a href="#"
+		      > <a href="#" title="TypeFamilies"
 		      >Test</a
-		      > <a href="#"
-		      >*</a
-		      > <a href="#"
+		      > <a href="#" title="TypeFamilies"
 		      >Y</a
 		      ></span
 		    > <a href="#" class="selflink"
@@ -1146,6 +1146,10 @@
 		  ><details id="i:ic:Test:Test:1"
 		    ><summary class="hide-when-js-enabled"
 		      >Instance details</summary
+		      ><p
+		      >Defined in <a href="#"
+			>TypeFamilies</a
+			></p
 		      ></details
 		    ></td
 		  ></tr
@@ -1154,11 +1158,9 @@
 		  ><span class="inst-left"
 		    ><span class="instance details-toggle-control details-toggle" data-details-id="i:ic:Test:Test:2"
 		      ></span
-		      > <a href="#"
+		      > <a href="#" title="TypeFamilies"
 		      >Test</a
-		      > <a href="#"
-		      >*</a
-		      > <a href="#"
+		      > <a href="#" title="TypeFamilies"
 		      >X</a
 		      ></span
 		    > <a href="#" class="selflink"
@@ -1174,6 +1176,10 @@
 		  ><details id="i:ic:Test:Test:2"
 		    ><summary class="hide-when-js-enabled"
 		      >Instance details</summary
+		      ><p
+		      >Defined in <a href="#"
+			>TypeFamilies</a
+			></p
 		      ></details
 		    ></td
 		  ></tr
@@ -1206,11 +1212,9 @@
 		      ></span
 		      > <span class="keyword"
 		      >type</span
-		      > <a href="#"
+		      > <a href="#" title="TypeFamilies"
 		      >Foo</a
-		      > <a href="#"
-		      >*</a
-		      > <a href="#"
+		      > <a href="#" title="TypeFamilies"
 		      >Y</a
 		      ></span
 		    > <a href="#" class="selflink"
@@ -1224,16 +1228,18 @@
 		  ><details id="i:if:Foo:Foo:1"
 		    ><summary class="hide-when-js-enabled"
 		      >Instance details</summary
-		      ><div class="src"
+		      ><p
+		      >Defined in <a href="#"
+			>TypeFamilies</a
+			></p
+		      > <div class="src"
 		      ><span class="keyword"
 			>type</span
-			> <a href="#"
+			> <a href="#" title="TypeFamilies"
 			>Foo</a
-			> <a href="#"
-			>*</a
-			> <a href="#"
+			> <a href="#" title="TypeFamilies"
 			>Y</a
-			> = <a href="#"
+			> = <a href="#" title="TypeFamilies"
 			>X</a
 			></div
 		      ></details
@@ -1246,11 +1252,9 @@
 		      ></span
 		      > <span class="keyword"
 		      >type</span
-		      > <a href="#"
+		      > <a href="#" title="TypeFamilies"
 		      >Foo</a
-		      > <a href="#"
-		      >*</a
-		      > <a href="#"
+		      > <a href="#" title="TypeFamilies"
 		      >X</a
 		      ></span
 		    > <a href="#" class="selflink"
@@ -1264,16 +1268,18 @@
 		  ><details id="i:if:Foo:Foo:2"
 		    ><summary class="hide-when-js-enabled"
 		      >Instance details</summary
-		      ><div class="src"
+		      ><p
+		      >Defined in <a href="#"
+			>TypeFamilies</a
+			></p
+		      > <div class="src"
 		      ><span class="keyword"
 			>type</span
-			> <a href="#"
+			> <a href="#" title="TypeFamilies"
 			>Foo</a
-			> <a href="#"
-			>*</a
-			> <a href="#"
+			> <a href="#" title="TypeFamilies"
 			>X</a
-			> = <a href="#"
+			> = <a href="#" title="TypeFamilies"
 			>Y</a
 			></div
 		      ></details
@@ -1289,9 +1295,7 @@
 	    >data family</span
 	    > <a id="t:Bat" class="def"
 	    >Bat</a
-	    > (a :: k) :: <a href="#"
-	    >*</a
-	    > <a href="#" class="selflink"
+	    > (a :: k) :: * <a href="#" class="selflink"
 	    >#</a
 	    ></p
 	  ><div class="doc"
@@ -1310,11 +1314,11 @@
 		      ></span
 		      > <span class="keyword"
 		      >data</span
-		      > <a href="#"
+		      > <a href="#" title="TypeFamilies"
 		      >Bat</a
-		      > <a href="#"
+		      > (z :: <a href="#" title="TypeFamilies"
 		      >Z</a
-		      ></span
+		      >)</span
 		    > <a href="#" class="selflink"
 		    >#</a
 		    ></td
@@ -1328,34 +1332,44 @@
 		  ><details id="i:if:Bat:Bat:1"
 		    ><summary class="hide-when-js-enabled"
 		      >Instance details</summary
-		      ><div class="src"
+		      ><p
+		      >Defined in <a href="#"
+			>TypeFamilies</a
+			></p
+		      > <div class="src"
 		      ><span class="keyword"
 			>data</span
-			> <a href="#"
+			> <a href="#" title="TypeFamilies"
 			>Bat</a
-			> <a href="#"
+			> (z :: <a href="#" title="TypeFamilies"
 			>Z</a
-			> <span class="keyword"
+			>) <span class="keyword"
 			>where</span
 			><ul class="inst"
 			><li class="inst"
 			  ><a id="v:BatZ1" class="def"
 			    >BatZ1</a
-			    > :: <a href="#"
-			    >Bat</a
-			    > <a href="#"
+			    > :: <span class="keyword"
+			    >forall</span
+			    > (z :: <a href="#" title="TypeFamilies"
 			    >Z</a
-			    > <a href="#"
+			    >). <a href="#" title="TypeFamilies"
+			    >Z</a
+			    > -&gt; <a href="#" title="TypeFamilies"
+			    >Bat</a
+			    > <a href="#" title="TypeFamilies"
 			    >ZA</a
 			    ></li
 			  ><li class="inst"
 			  ><a id="v:BatZ2" class="def"
 			    >BatZ2</a
-			    > :: <a href="#"
-			    >Bat</a
-			    > <a href="#"
+			    > :: <span class="keyword"
+			    >forall</span
+			    > (z :: <a href="#" title="TypeFamilies"
 			    >Z</a
-			    > <a href="#"
+			    >). {..} -&gt; <a href="#" title="TypeFamilies"
+			    >Bat</a
+			    > <a href="#" title="TypeFamilies"
 			    >ZB</a
 			    ></li
 			  ></ul
@@ -1370,11 +1384,9 @@
 		      ></span
 		      > <span class="keyword"
 		      >data</span
-		      > <a href="#"
+		      > <a href="#" title="TypeFamilies"
 		      >Bat</a
-		      > <a href="#"
-		      >*</a
-		      > <a href="#"
+		      > <a href="#" title="TypeFamilies"
 		      >Y</a
 		      ></span
 		    > <a href="#" class="selflink"
@@ -1390,18 +1402,20 @@
 		  ><details id="i:if:Bat:Bat:2"
 		    ><summary class="hide-when-js-enabled"
 		      >Instance details</summary
-		      ><div class="src"
+		      ><p
+		      >Defined in <a href="#"
+			>TypeFamilies</a
+			></p
+		      > <div class="src"
 		      ><span class="keyword"
 			>data</span
-			> <a href="#"
+			> <a href="#" title="TypeFamilies"
 			>Bat</a
-			> <a href="#"
-			>*</a
-			> <a href="#"
+			> <a href="#" title="TypeFamilies"
 			>Y</a
 			> = <a id="v:BatY" class="def"
 			>BatY</a
-			> <a href="#"
+			> <a href="#" title="TypeFamilies"
 			>Y</a
 			></div
 		      ></details
@@ -1414,11 +1428,9 @@
 		      ></span
 		      > <span class="keyword"
 		      >data</span
-		      > <a href="#"
+		      > <a href="#" title="TypeFamilies"
 		      >Bat</a
-		      > <a href="#"
-		      >*</a
-		      > <a href="#"
+		      > <a href="#" title="TypeFamilies"
 		      >X</a
 		      ></span
 		    > <a href="#" class="selflink"
@@ -1434,20 +1446,22 @@
 		  ><details id="i:if:Bat:Bat:3"
 		    ><summary class="hide-when-js-enabled"
 		      >Instance details</summary
-		      ><div class="src"
+		      ><p
+		      >Defined in <a href="#"
+			>TypeFamilies</a
+			></p
+		      > <div class="src"
 		      ><span class="keyword"
 			>data</span
-			> <a href="#"
+			> <a href="#" title="TypeFamilies"
 			>Bat</a
-			> <a href="#"
-			>*</a
-			> <a href="#"
+			> <a href="#" title="TypeFamilies"
 			>X</a
 			> <ul class="inst"
 			><li class="inst"
 			  >= <a id="v:BatX" class="def"
 			    >BatX</a
-			    > <a href="#"
+			    > <a href="#" title="TypeFamilies"
 			    >X</a
 			    ></li
 			  ><li class="inst"
@@ -1457,13 +1471,13 @@
 			    ><li
 			      ><a id="v:aaa" class="def"
 				>aaa</a
-				> :: <a href="#"
+				> :: <a href="#" title="TypeFamilies"
 				>X</a
 				></li
 			      ><li
 			      ><a id="v:bbb" class="def"
 				>bbb</a
-				> :: <a href="#"
+				> :: <a href="#" title="TypeFamilies"
 				>Y</a
 				></li
 			      ></ul
@@ -1498,9 +1512,7 @@
 	      >data</span
 	      > <a id="t:AssocD" class="def"
 	      >AssocD</a
-	      > a :: <a href="#"
-	      >*</a
-	      > <a href="#" class="selflink"
+	      > a :: * <a href="#" class="selflink"
 	      >#</a
 	      ></p
 	    ><div class="doc"
@@ -1512,9 +1524,7 @@
 	      >type</span
 	      > <a id="t:AssocT" class="def"
 	      >AssocT</a
-	      > a :: <a href="#"
-	      >*</a
-	      > <a href="#" class="selflink"
+	      > a :: * <a href="#" class="selflink"
 	      >#</a
 	      ></p
 	    ><div class="doc"
@@ -1532,11 +1542,9 @@
 		  ><span class="inst-left"
 		    ><span class="instance details-toggle-control details-toggle" data-details-id="i:ic:Assoc:Assoc:1"
 		      ></span
-		      > <a href="#"
+		      > <a href="#" title="TypeFamilies"
 		      >Assoc</a
-		      > <a href="#"
-		      >*</a
-		      > <a href="#"
+		      > <a href="#" title="TypeFamilies"
 		      >Y</a
 		      ></span
 		    > <a href="#" class="selflink"
@@ -1552,35 +1560,31 @@
 		  ><details id="i:ic:Assoc:Assoc:1"
 		    ><summary class="hide-when-js-enabled"
 		      >Instance details</summary
-		      ><div class="subs associated-types"
+		      ><p
+		      >Defined in <a href="#"
+			>TypeFamilies</a
+			></p
+		      > <div class="subs associated-types"
 		      ><p class="caption"
 			>Associated Types</p
 			><p class="src"
 			><span class="keyword"
 			  >data</span
-			  > <a href="#"
+			  > <a href="#" title="TypeFamilies"
 			  >AssocD</a
-			  > <a href="#"
+			  > <a href="#" title="TypeFamilies"
 			  >Y</a
-			  > (a :: <a href="#"
-			  >Y</a
-			  >) :: <a href="#"
-			  >*</a
-			  > <a href="#" class="selflink"
+			  > :: * <a href="#" class="selflink"
 			  >#</a
 			  ></p
 			><p class="src"
 			><span class="keyword"
 			  >type</span
-			  > <a href="#"
+			  > <a href="#" title="TypeFamilies"
 			  >AssocT</a
-			  > <a href="#"
-			  >Y</a
-			  > (a :: <a href="#"
+			  > <a href="#" title="TypeFamilies"
 			  >Y</a
-			  >) :: <a href="#"
-			  >*</a
-			  > <a href="#" class="selflink"
+			  > :: * <a href="#" class="selflink"
 			  >#</a
 			  ></p
 			></div
@@ -1592,11 +1596,9 @@
 		  ><span class="inst-left"
 		    ><span class="instance details-toggle-control details-toggle" data-details-id="i:ic:Assoc:Assoc:2"
 		      ></span
-		      > <a href="#"
+		      > <a href="#" title="TypeFamilies"
 		      >Assoc</a
-		      > <a href="#"
-		      >*</a
-		      > <a href="#"
+		      > <a href="#" title="TypeFamilies"
 		      >X</a
 		      ></span
 		    > <a href="#" class="selflink"
@@ -1612,35 +1614,31 @@
 		  ><details id="i:ic:Assoc:Assoc:2"
 		    ><summary class="hide-when-js-enabled"
 		      >Instance details</summary
-		      ><div class="subs associated-types"
+		      ><p
+		      >Defined in <a href="#"
+			>TypeFamilies</a
+			></p
+		      > <div class="subs associated-types"
 		      ><p class="caption"
 			>Associated Types</p
 			><p class="src"
 			><span class="keyword"
 			  >data</span
-			  > <a href="#"
+			  > <a href="#" title="TypeFamilies"
 			  >AssocD</a
-			  > <a href="#"
+			  > <a href="#" title="TypeFamilies"
 			  >X</a
-			  > (a :: <a href="#"
-			  >X</a
-			  >) :: <a href="#"
-			  >*</a
-			  > <a href="#" class="selflink"
+			  > :: * <a href="#" class="selflink"
 			  >#</a
 			  ></p
 			><p class="src"
 			><span class="keyword"
 			  >type</span
-			  > <a href="#"
+			  > <a href="#" title="TypeFamilies"
 			  >AssocT</a
-			  > <a href="#"
-			  >X</a
-			  > (a :: <a href="#"
+			  > <a href="#" title="TypeFamilies"
 			  >X</a
-			  >) :: <a href="#"
-			  >*</a
-			  > <a href="#" class="selflink"
+			  > :: * <a href="#" class="selflink"
 			  >#</a
 			  ></p
 			></div
@@ -1672,11 +1670,11 @@
 	    ><table
 	    ><tr
 	      ><td class="src"
-		><a href="#"
+		><a href="#" title="TypeFamilies"
 		  >Bar</a
-		  > <a href="#"
+		  > <a href="#" title="TypeFamilies"
 		  >X</a
-		  > = <a href="#"
+		  > = <a href="#" title="TypeFamilies"
 		  >X</a
 		  ></td
 		><td class="doc empty"
@@ -1684,9 +1682,9 @@
 		></tr
 	      ><tr
 	      ><td class="src"
-		><a href="#"
+		><a href="#" title="TypeFamilies"
 		  >Bar</a
-		  > y = <a href="#"
+		  > y = <a href="#" title="TypeFamilies"
 		  >Y</a
 		  ></td
 		><td class="doc empty"
@@ -1716,13 +1714,11 @@
 		      ></span
 		      > <span class="keyword"
 		      >type</span
-		      > <a href="#"
-		      >(&lt;&gt;)</a
-		      > <a href="#"
-		      >X</a
-		      > <a href="#"
+		      > <a href="#" title="TypeFamilies"
 		      >XXX</a
-		      > <a href="#"
+		      > <a href="#" title="TypeFamilies"
+		      >&lt;&gt;</a
+		      > <a href="#" title="TypeFamilies"
 		      >XX</a
 		      ></span
 		    > <a href="#" class="selflink"
@@ -1736,18 +1732,20 @@
 		  ><details id="i:if:-60--62-:-60--62-:1"
 		    ><summary class="hide-when-js-enabled"
 		      >Instance details</summary
-		      ><div class="src"
+		      ><p
+		      >Defined in <a href="#"
+			>TypeFamilies</a
+			></p
+		      > <div class="src"
 		      ><span class="keyword"
 			>type</span
-			> <a href="#"
-			>(&lt;&gt;)</a
-			> <a href="#"
-			>X</a
-			> <a href="#"
+			> <a href="#" title="TypeFamilies"
 			>XXX</a
-			> <a href="#"
+			> <a href="#" title="TypeFamilies"
+			>&lt;&gt;</a
+			> <a href="#" title="TypeFamilies"
 			>XX</a
-			> = <a href="#"
+			> = <a href="#" title="TypeFamilies"
 			>X</a
 			></div
 		      ></details
@@ -1760,13 +1758,11 @@
 		      ></span
 		      > <span class="keyword"
 		      >type</span
-		      > <a href="#"
-		      >(&lt;&gt;)</a
-		      > <a href="#"
-		      >*</a
-		      > <a href="#"
+		      > <a href="#" title="TypeFamilies"
 		      >Y</a
-		      > a</span
+		      > <a href="#" title="TypeFamilies"
+		      >&lt;&gt;</a
+		      > (a :: *)</span
 		    > <a href="#" class="selflink"
 		    >#</a
 		    ></td
@@ -1778,16 +1774,18 @@
 		  ><details id="i:if:-60--62-:-60--62-:2"
 		    ><summary class="hide-when-js-enabled"
 		      >Instance details</summary
-		      ><div class="src"
+		      ><p
+		      >Defined in <a href="#"
+			>TypeFamilies</a
+			></p
+		      > <div class="src"
 		      ><span class="keyword"
 			>type</span
-			> <a href="#"
-			>(&lt;&gt;)</a
-			> <a href="#"
-			>*</a
-			> <a href="#"
+			> <a href="#" title="TypeFamilies"
 			>Y</a
-			> a = a</div
+			> <a href="#" title="TypeFamilies"
+			>&lt;&gt;</a
+			> (a :: *) = a</div
 		      ></details
 		    ></td
 		  ></tr
@@ -1798,13 +1796,11 @@
 		      ></span
 		      > <span class="keyword"
 		      >type</span
-		      > <a href="#"
-		      >(&lt;&gt;)</a
-		      > <a href="#"
-		      >*</a
-		      > <a href="#"
+		      > <a href="#" title="TypeFamilies"
 		      >X</a
-		      > a</span
+		      > <a href="#" title="TypeFamilies"
+		      >&lt;&gt;</a
+		      > (a :: *)</span
 		    > <a href="#" class="selflink"
 		    >#</a
 		    ></td
@@ -1816,16 +1812,18 @@
 		  ><details id="i:if:-60--62-:-60--62-:3"
 		    ><summary class="hide-when-js-enabled"
 		      >Instance details</summary
-		      ><div class="src"
+		      ><p
+		      >Defined in <a href="#"
+			>TypeFamilies</a
+			></p
+		      > <div class="src"
 		      ><span class="keyword"
 			>type</span
-			> <a href="#"
-			>(&lt;&gt;)</a
-			> <a href="#"
-			>*</a
-			> <a href="#"
+			> <a href="#" title="TypeFamilies"
 			>X</a
-			> a = <a href="#"
+			> <a href="#" title="TypeFamilies"
+			>&lt;&gt;</a
+			> (a :: *) = <a href="#" title="TypeFamilies"
 			>X</a
 			></div
 		      ></details
@@ -1854,13 +1852,11 @@
 		  ><span class="inst-left"
 		    ><span class="instance details-toggle-control details-toggle" data-details-id="i:ic:-62--60-:-62--60-:1"
 		      ></span
-		      > <a href="#"
-		      >(&gt;&lt;)</a
-		      > <a href="#"
-		      >X</a
-		      > <a href="#"
+		      > <a href="#" title="TypeFamilies"
 		      >XX</a
-		      > <a href="#"
+		      > <a href="#" title="TypeFamilies"
+		      >&gt;&lt;</a
+		      > <a href="#" title="TypeFamilies"
 		      >XXX</a
 		      ></span
 		    > <a href="#" class="selflink"
@@ -1874,6 +1870,10 @@
 		  ><details id="i:ic:-62--60-:-62--60-:1"
 		    ><summary class="hide-when-js-enabled"
 		      >Instance details</summary
+		      ><p
+		      >Defined in <a href="#"
+			>TypeFamilies</a
+			></p
 		      ></details
 		    ></td
 		  ></tr