[nomaster] Carve up Types.scala