diff --git a/horse/legacy.kk b/horse/legacy.kk
index 008df15..a4f632f 100644
--- a/horse/legacy.kk
+++ b/horse/legacy.kk
@@ -12,8 +12,7 @@ pub struct veteran
   stat: spark<stat>
   aptitude: spark<aptitude>
   unique: maybe<spark<unique>>
-  races: list<spark<race>>
-  skills: list<spark<skill>>
+  generic: list<spark<generic>>
   results: list<race-result>
 
 // Character identity.
diff --git a/horse/spark.kk b/horse/spark.kk
index 1a0daee..8327d8d 100644
--- a/horse/spark.kk
+++ b/horse/spark.kk
@@ -72,116 +72,115 @@ pub type unique
 pub fun unique/show(this: unique): string
   "TODO(zeph): unique skills"
 
-// Race and scenario (white) sparks.
-pub type race
-  Asahi-Hai-Futurity-Stakes
-  Hanshin-Juvenile-Fillies
-  Hopeful-Stakes
+// Race, skill, and scenario (white) sparks.
+pub type generic
+  February-Stakes
+  Takamatsunomiya-Kinen
+  Osaka-Hai
   Oka-Sho
   Satsuki-Sho
+  Tenno-Sho-Spring
   NHK-Mile-Cup
+  Victoria-Mile
   Japanese-Oaks
   Japanese-Derby
   Yasuda-Kinen
   Takarazuka-Kinen
-  Japan-Dirt-Derby
   Sprinters-Stakes
-  Kikuka-Sho
   Shuka-Sho
+  Kikuka-Sho
   Tenno-Sho-Autumn
-  JBC-Classic
-  JBC-Ladies-Classic
-  JBC-Sprint
   Queen-Elizabeth-II-Cup
-  Japan-Cup
   Mile-Championship
+  Japan-Cup
   Champions-Cup
+  Hanshin-Juvenile-Fillies
+  Asahi-Hai-Futurity-Stakes
   Arima-Kinen
+  Hopeful-Stakes
   Tokyo-Daishoten
-  February-Stakes
-  Osaka-Hai
-  Takamatsunomiya-Kinen
-  Tenno-Sho-Spring
-  Victoria-Mile
+  JBC-Classic
+  JBC-Sprint
+  JBC-Ladies-Classic
+  Japan-Dirt-Derby
   Teio-Sho
+  Skill(skill: string)
   URA-Finale
   Unity-Cup
 
 // Automatically generated.
-// Equality comparison of the `race` type.
-pub fip fun race/(==)(this : race, other : race) : bool
+// Equality comparison of the `generic` type.
+pub fun generic/(==)(this : generic, other : generic) : e bool
   match (this, other)
-    (Asahi-Hai-Futurity-Stakes, Asahi-Hai-Futurity-Stakes) -> True
-    (Hanshin-Juvenile-Fillies, Hanshin-Juvenile-Fillies) -> True
-    (Hopeful-Stakes, Hopeful-Stakes) -> True
+    (February-Stakes, February-Stakes) -> True
+    (Takamatsunomiya-Kinen, Takamatsunomiya-Kinen) -> True
+    (Osaka-Hai, Osaka-Hai) -> True
     (Oka-Sho, Oka-Sho) -> True
     (Satsuki-Sho, Satsuki-Sho) -> True
+    (Tenno-Sho-Spring, Tenno-Sho-Spring) -> True
     (NHK-Mile-Cup, NHK-Mile-Cup) -> True
+    (Victoria-Mile, Victoria-Mile) -> True
     (Japanese-Oaks, Japanese-Oaks) -> True
     (Japanese-Derby, Japanese-Derby) -> True
     (Yasuda-Kinen, Yasuda-Kinen) -> True
     (Takarazuka-Kinen, Takarazuka-Kinen) -> True
-    (Japan-Dirt-Derby, Japan-Dirt-Derby) -> True
     (Sprinters-Stakes, Sprinters-Stakes) -> True
-    (Kikuka-Sho, Kikuka-Sho) -> True
     (Shuka-Sho, Shuka-Sho) -> True
+    (Kikuka-Sho, Kikuka-Sho) -> True
     (Tenno-Sho-Autumn, Tenno-Sho-Autumn) -> True
-    (JBC-Classic, JBC-Classic) -> True
-    (JBC-Ladies-Classic, JBC-Ladies-Classic) -> True
-    (JBC-Sprint, JBC-Sprint) -> True
     (Queen-Elizabeth-II-Cup, Queen-Elizabeth-II-Cup) -> True
-    (Japan-Cup, Japan-Cup) -> True
     (Mile-Championship, Mile-Championship) -> True
+    (Japan-Cup, Japan-Cup) -> True
     (Champions-Cup, Champions-Cup) -> True
+    (Hanshin-Juvenile-Fillies, Hanshin-Juvenile-Fillies) -> True
+    (Asahi-Hai-Futurity-Stakes, Asahi-Hai-Futurity-Stakes) -> True
     (Arima-Kinen, Arima-Kinen) -> True
+    (Hopeful-Stakes, Hopeful-Stakes) -> True
     (Tokyo-Daishoten, Tokyo-Daishoten) -> True
-    (February-Stakes, February-Stakes) -> True
-    (Osaka-Hai, Osaka-Hai) -> True
-    (Takamatsunomiya-Kinen, Takamatsunomiya-Kinen) -> True
-    (Tenno-Sho-Spring, Tenno-Sho-Spring) -> True
-    (Victoria-Mile, Victoria-Mile) -> True
+    (JBC-Classic, JBC-Classic) -> True
+    (JBC-Sprint, JBC-Sprint) -> True
+    (JBC-Ladies-Classic, JBC-Ladies-Classic) -> True
+    (Japan-Dirt-Derby, Japan-Dirt-Derby) -> True
     (Teio-Sho, Teio-Sho) -> True
+    (Skill(skill), Skill(skill')) -> skill == skill'
     (URA-Finale, URA-Finale) -> True
     (Unity-Cup, Unity-Cup) -> True
     (_, _) -> False
 
 // Automatically generated.
-// Shows a string representation of the `race` type.
-pub fip fun race/show(this : race) : string
+// Shows a string representation of the `generic` type.
+pub fun generic/show(this : generic) : e string
   match this
-    Asahi-Hai-Futurity-Stakes -> "Asahi Hai Futurity Stakes"
-    Hanshin-Juvenile-Fillies -> "Hanshin Juvenile Fillies"
-    Hopeful-Stakes -> "Hopeful Stakes"
+    February-Stakes -> "February Stakes"
+    Takamatsunomiya-Kinen -> "Takamatsunomiya Kinen"
+    Osaka-Hai -> "Osaka Hai"
     Oka-Sho -> "Oka Sho"
     Satsuki-Sho -> "Satsuki Sho"
+    Tenno-Sho-Spring -> "Tenno Sho Spring"
     NHK-Mile-Cup -> "NHK Mile Cup"
+    Victoria-Mile -> "Victoria Mile"
     Japanese-Oaks -> "Japanese Oaks"
     Japanese-Derby -> "Japanese Derby"
     Yasuda-Kinen -> "Yasuda Kinen"
     Takarazuka-Kinen -> "Takarazuka Kinen"
-    Japan-Dirt-Derby -> "Japan Dirt Derby"
     Sprinters-Stakes -> "Sprinters Stakes"
-    Kikuka-Sho -> "Kikuka Sho"
     Shuka-Sho -> "Shuka Sho"
+    Kikuka-Sho -> "Kikuka Sho"
     Tenno-Sho-Autumn -> "Tenno Sho Autumn"
-    JBC-Classic -> "JBC Classic"
-    JBC-Ladies-Classic -> "JBC Ladies Classic"
-    JBC-Sprint -> "JBC Sprint"
     Queen-Elizabeth-II-Cup -> "Queen Elizabeth II Cup"
-    Japan-Cup -> "Japan Cup"
     Mile-Championship -> "Mile Championship"
+    Japan-Cup -> "Japan Cup"
     Champions-Cup -> "Champions Cup"
+    Hanshin-Juvenile-Fillies -> "Hanshin Juvenile Fillies"
+    Asahi-Hai-Futurity-Stakes -> "Asahi Hai Futurity Stakes"
     Arima-Kinen -> "Arima Kinen"
+    Hopeful-Stakes -> "Hopeful Stakes"
     Tokyo-Daishoten -> "Tokyo Daishoten"
-    February-Stakes -> "February Stakes"
-    Osaka-Hai -> "Osaka Hai"
-    Takamatsunomiya-Kinen -> "Takamatsunomiya Kinen"
-    Tenno-Sho-Spring -> "Tenno Sho Spring"
-    Victoria-Mile -> "Victoria Mile"
+    JBC-Classic -> "JBC Classic"
+    JBC-Sprint -> "JBC Sprint"
+    JBC-Ladies-Classic -> "JBC Ladies Classic"
+    Japan-Dirt-Derby -> "Japan Dirt Derby"
     Teio-Sho -> "Teio Sho"
+    Skill(skill) -> skill.show
     URA-Finale -> "URA Finale"
     Unity-Cup -> "Unity Cup"
-
-// Skill (white) sparks.
-// TODO: decide representation for skills; strings? actual real enumeration?
-pub type skill