Index: regression/trevora.tst
===================================================================
--- regression/trevora.tst	(revision 2339)
+++ regression/trevora.tst	(working copy)
@@ -69,10 +69,11 @@
 
 # games/trevor/auto/a008.sgf problems:
 
-#Quite passive.
-loadsgf games/trevor/auto/a008.sgf 10
-180 reg_genmove white
-#? [!F3]
+# No longer interesting, removed.
+# #Quite passive.
+# loadsgf games/trevor/auto/a008.sgf 10
+# 180 reg_genmove white
+# #? [!F3]
 
 
 
@@ -149,10 +150,11 @@
 
 # games/trevor/auto/a016.sgf problems:
 
-#Locally, E5 better than E4.
-loadsgf games/trevor/auto/a016.sgf 18
-280 reg_genmove white
-#? [!E4]
+# Neither move is good. Removed.
+# #Locally, E5 better than E4.
+# loadsgf games/trevor/auto/a016.sgf 18
+# 280 reg_genmove white
+# #? [!E4]
 
 
 
@@ -194,18 +196,19 @@
 
 #In this shape, G5 is best, not J6.
 loadsgf games/trevor/auto/a018.sgf 18
-340 reg_genmove white
-#? [!J6]
+340 restricted_genmove white G5 J6
+#? [G5]
 
 
 
 
 # games/trevor/auto/a019.sgf problems:
 
-#H3 is terrible.
-loadsgf games/trevor/auto/a019.sgf 6
-350 reg_genmove white
-#? [!H3]
+# H3 is no longer valued anywhere close to the top. Removed.
+# #H3 is terrible.
+# loadsgf games/trevor/auto/a019.sgf 6
+# 350 reg_genmove white
+# #? [!H3]
 
 
 
@@ -255,7 +258,7 @@
 #Last chance to invade.
 loadsgf games/trevor/auto/a025.sgf 12
 410 reg_genmove white
-#? [!(J7|D1)]
+#? [C7|C6|D7]
 
 
 
@@ -304,8 +307,8 @@
 
 #For a ko threat, D3 is better.
 loadsgf games/trevor/auto/a031.sgf 28
-470 reg_genmove white
-#? [!E2]
+470 restricted_genmove white D3 E2
+#? [D3]
 
 
 #Sacrificing these two for the rest seems best.
@@ -356,9 +359,11 @@
 531 owl_does_defend H4 E6
 #? [1]*
 
+# A1 is a blunder, made more clear by filling F5.
 loadsgf games/trevor/auto/a035.sgf 50
+play white F5
 540 reg_genmove white
-#? [!A1]
+#? [F2|G2|E3]
 
 
 loadsgf games/trevor/auto/a035.sgf 51
@@ -372,14 +377,14 @@
 
 #D4 is huge.  Other moves possible.
 loadsgf games/trevor/auto/a036.sgf 6
-560 reg_genmove white
-#? [!B4]
+560 restricted_genmove white B4 D4
+#? [D4]
 
 
 #Breaking into black's area is required.
 loadsgf games/trevor/auto/a036.sgf 10
-570 reg_genmove white
-#? [!B5]
+570 restricted_genmove white B5 D4
+#? [D4]
 
 
 #E6 is bigger, and enough to win.
@@ -394,8 +399,8 @@
 
 #B4 almost always better in this shape.
 loadsgf games/trevor/auto/a037.sgf 12
-600 reg_genmove white
-#? [!A5]
+600 restricted_genmove white A5 B4
+#? [B4]
 
 
 
@@ -430,7 +435,5 @@
 
 #C8 is an overplay.
 loadsgf games/trevor/auto/a041.sgf 12
-660 reg_genmove white
-#? [!C8]
-
-
+660 restricted_genmove white C8 D8
+#? [D8]
Index: regression/strategy4.tst
===================================================================
--- regression/strategy4.tst	(revision 2339)
+++ regression/strategy4.tst	(working copy)
@@ -40,8 +40,8 @@
 
 # E16 is completely aimless and ineffective.
 loadsgf games/strategy38.sgf 51
-158 reg_genmove black
-#? [!E16]
+158 restricted_genmove black E16 R18
+#? [R18]
 
 loadsgf games/strategy38.sgf 117
 159 reg_genmove black
@@ -103,8 +103,8 @@
 
 # White can't play G19. Locally this move must be at G18.
 loadsgf games/strategy42.sgf 174
-170 reg_genmove white
-#? [!G19]
+170 restricted_genmove white G18 G19
+#? [G18]
 
 # T19 is out of the question. Locally T17 is better but the correct
 # move is A5.
@@ -116,8 +116,8 @@
 # doesn't utilize the full ko potential of the position. Locally M8 is
 # superior.
 loadsgf games/strategy42.sgf 214
-172 reg_genmove white
-#? [!N9]
+172 restricted_genmove white M8 N9
+#? [M8]
 
 #CATEGORY=KO
 #DESCRIPTION=GNU Go lacks sufficient Ko understanding
@@ -234,8 +234,8 @@
 #? [A13]*
 
 loadsgf games/bretz.sgf 88
-195 reg_genmove black
-#? [!S14]
+195 restricted_genmove black S13 S14
+#? [S13]
 
 loadsgf games/bretz.sgf 100
 196 reg_genmove black
@@ -278,13 +278,13 @@
 #? [B2]*
 
 loadsgf games/juka1.sgf 48
-205 reg_genmove black
-#? [!O11]
+205 restricted_genmove black O11 P11
+#? [P11]
 
 #CATEGORY=SEMEAI
 #DESCRIPTION=K6 does take K8 to no eyes, but...
 #SEVERITY=8
-#GNU Go misses that K10 (large B group) has way few liberties
+#GNU Go misses that K10 (large B group) has way fewer liberties
 #than O9 group, hense missing importance of cutting off K8.
 loadsgf games/strategy45.sgf
 206 reg_genmove black
@@ -292,8 +292,8 @@
 
 # T6 fails badly. Locally S9 looks best.
 loadsgf games/owl30.sgf 84
-207 reg_genmove black
-#? [!T6]
+207 restricted_genmove black R9 S9 T6
+#? [S9]
 
 loadsgf games/lordofpi.sgf 36
 208 reg_genmove black
@@ -301,8 +301,8 @@
 
 # A4 allows W to make seki
 loadsgf games/lordofpi.sgf 46
-209 reg_genmove black
-#? [!A4]
+209 restricted_genmove black A1 A3 A4 C1 D3
+#? [A3]
 
 loadsgf games/lordofpi.sgf 52
 210 reg_genmove black
@@ -325,10 +325,11 @@
 214 reg_genmove white
 #? [D2]
 
-# CD103a incorrectly thinks E7 defends against a combination attack.
-loadsgf games/owl33.sgf 200
-215 reg_genmove black
-#? [!E7]
+# No longer interesting. Removed.
+# # CD103a incorrectly thinks E7 defends against a combination attack.
+# loadsgf games/owl33.sgf 200
+# 215 reg_genmove black
+# #? [!E7]
 
 # B6 is too slow at this time.
 loadsgf games/handtalk/handtalk1.sgf 45
@@ -341,8 +342,8 @@
 
 # locally F12 is better. Similar problem at move 51
 loadsgf games/handtalk/handtalk1.sgf 55
-218 reg_genmove black
-#? [!E12]
+218 restricted_genmove black C14 E12 F12
+#? [F12]
 
 # lots of good problems in this game
 loadsgf games/nngs/gnugo-3.1.30-morlvera-200204041921.sgf 154