Merge trunk

47 files changed, 927 insertions, 769 deletions

diff --git a/tests/bind.test b/tests/bind.test
index adc628a..4439634 100644
--- a/tests/bind.test
+++ b/tests/bind.test
@@ -971,7 +971,7 @@ test bind-13.35 {Tk_BindEvent procedure: execute binding} -setup {
     return $x
 } -cleanup {
     destroy .t.f
-} -result {1}
+} -result 1
 test bind-13.38 {Tk_BindEvent procedure: binding gets to run} -setup {
     frame .t.f -class Test -width 150 -height 100
     pack .t.f
@@ -1054,7 +1054,7 @@ test bind-15.1 {MatchPatterns procedure, ignoring type mismatches} -setup {
     return $x
 } -cleanup {
     destroy .t.f
-} -result {1}
+} -result 1
 test bind-15.2 {MatchPatterns procedure, ignoring type mismatches} -setup {
     frame .t.f -class Test -width 150 -height 100
     pack .t.f
@@ -1072,7 +1072,7 @@ test bind-15.2 {MatchPatterns procedure, ignoring type mismatches} -setup {
     return $x
 } -cleanup {
     destroy .t.f
-} -result {1}
+} -result 1
 test bind-15.3 {MatchPatterns procedure, ignoring type mismatches} -setup {
     frame .t.f -class Test -width 150 -height 100
     pack .t.f
@@ -1087,7 +1087,7 @@ test bind-15.3 {MatchPatterns procedure, ignoring type mismatches} -setup {
     return $x
 } -cleanup {
     destroy .t.f
-} -result {0}
+} -result 0
 test bind-15.4 {MatchPatterns procedure, ignoring type mismatches} -setup {
     frame .t.f -class Test -width 150 -height 100
     pack .t.f
@@ -1103,7 +1103,7 @@ test bind-15.4 {MatchPatterns procedure, ignoring type mismatches} -setup {
     return $x
 } -cleanup {
     destroy .t.f
-} -result {1}
+} -result 1
 test bind-15.5 {MatchPatterns procedure, ignoring type mismatches} -setup {
     frame .t.f -class Test -width 150 -height 100
     pack .t.f
@@ -1119,7 +1119,7 @@ test bind-15.5 {MatchPatterns procedure, ignoring type mismatches} -setup {
     return $x
 } -cleanup {
     destroy .t.f
-} -result {1}
+} -result 1
 test bind-15.6 {MatchPatterns procedure, ignoring type mismatches} -setup {
     frame .t.f -class Test -width 150 -height 100
     pack .t.f
@@ -1136,7 +1136,7 @@ test bind-15.6 {MatchPatterns procedure, ignoring type mismatches} -setup {
     return $x
 } -cleanup {
     destroy .t.f
-} -result {0}
+} -result 0
 test bind-15.7 {MatchPatterns procedure, ignoring type mismatches} -setup {
     frame .t.f -class Test -width 150 -height 100
     pack .t.f
@@ -1153,7 +1153,7 @@ test bind-15.7 {MatchPatterns procedure, ignoring type mismatches} -setup {
     return $x
 } -cleanup {
     destroy .t.f
-} -result {1}
+} -result 1
 test bind-15.8 {MatchPatterns procedure, ignoring type mismatches} -setup {
     frame .t.f -class Test -width 150 -height 100
     pack .t.f
@@ -1168,7 +1168,7 @@ test bind-15.8 {MatchPatterns procedure, ignoring type mismatches} -setup {
     return $x
 } -cleanup {
     destroy .t.f
-} -result {0}
+} -result 0
 test bind-15.9 {MatchPatterns procedure, modifier checks} -setup {
     frame .t.f -class Test -width 150 -height 100
     pack .t.f
@@ -1181,7 +1181,7 @@ test bind-15.9 {MatchPatterns procedure, modifier checks} -setup {
     return $x
 } -cleanup {
     destroy .t.f
-} -result {1}
+} -result 1
 test bind-15.10 {MatchPatterns procedure, modifier checks} -setup {
     frame .t.f -class Test -width 150 -height 100
     pack .t.f
@@ -1194,7 +1194,7 @@ test bind-15.10 {MatchPatterns procedure, modifier checks} -setup {
     return $x
 } -cleanup {
     destroy .t.f
-} -result {1}
+} -result 1
 test bind-15.11 {MatchPatterns procedure, modifier checks} -setup {
     frame .t.f -class Test -width 150 -height 100
     pack .t.f
@@ -1207,7 +1207,7 @@ test bind-15.11 {MatchPatterns procedure, modifier checks} -setup {
     return $x
 } -cleanup {
     destroy .t.f
-} -result {0}
+} -result 0
 test bind-15.12 {MatchPatterns procedure, ignore modifier presses and releases} -constraints {
     nonPortable
 } -setup {
@@ -1226,7 +1226,7 @@ test bind-15.12 {MatchPatterns procedure, ignore modifier presses and releases}
     return $x
 } -cleanup {
     destroy .t.f
-} -result {1}
+} -result 1
 test bind-15.13 {MatchPatterns procedure, checking detail} -setup {
     frame .t.f -class Test -width 150 -height 100
     pack .t.f
@@ -1240,7 +1240,7 @@ test bind-15.13 {MatchPatterns procedure, checking detail} -setup {
     return $x
 } -cleanup {
     destroy .t.f
-} -result {0}
+} -result 0
 test bind-15.14 {MatchPatterns procedure, checking "nearby"} -setup {
     frame .t.f -class Test -width 150 -height 100
     pack .t.f
@@ -1257,7 +1257,7 @@ test bind-15.14 {MatchPatterns procedure, checking "nearby"} -setup {
     return $x
 } -cleanup {
     destroy .t.f
-} -result {1}
+} -result 1
 test bind-15.15 {MatchPatterns procedure, checking "nearby"} -setup {
     frame .t.f -class Test -width 150 -height 100
     pack .t.f
@@ -1274,7 +1274,7 @@ test bind-15.15 {MatchPatterns procedure, checking "nearby"} -setup {
     return $x
 } -cleanup {
     destroy .t.f
-} -result {1}
+} -result 1
 test bind-15.16 {MatchPatterns procedure, checking "nearby"} -setup {
     frame .t.f -class Test -width 150 -height 100
     pack .t.f
@@ -1291,7 +1291,7 @@ test bind-15.16 {MatchPatterns procedure, checking "nearby"} -setup {
     return $x
 } -cleanup {
     destroy .t.f
-} -result {0}
+} -result 0
 test bind-15.17 {MatchPatterns procedure, checking "nearby"} -setup {
     frame .t.f -class Test -width 150 -height 100
     pack .t.f
@@ -1308,7 +1308,7 @@ test bind-15.17 {MatchPatterns procedure, checking "nearby"} -setup {
     return $x
 } -cleanup {
     destroy .t.f
-} -result {0}
+} -result 0
 test bind-15.18 {MatchPatterns procedure, checking "nearby"} -setup {
     frame .t.f -class Test -width 150 -height 100
     pack .t.f
@@ -1325,7 +1325,7 @@ test bind-15.18 {MatchPatterns procedure, checking "nearby"} -setup {
     return $x
 } -cleanup {
     destroy .t.f
-} -result {0}
+} -result 0
 test bind-15.19 {MatchPatterns procedure, checking "nearby"} -setup {
     frame .t.f -class Test -width 150 -height 100
     pack .t.f
@@ -1342,7 +1342,7 @@ test bind-15.19 {MatchPatterns procedure, checking "nearby"} -setup {
     return $x
 } -cleanup {
     destroy .t.f
-} -result {0}
+} -result 0
 test bind-15.20 {MatchPatterns procedure, checking "nearby"} -setup {
     frame .t.f -class Test -width 150 -height 100
     pack .t.f
@@ -1359,7 +1359,7 @@ test bind-15.20 {MatchPatterns procedure, checking "nearby"} -setup {
     return $x
 } -cleanup {
     destroy .t.f
-} -result {1}
+} -result 1
 test bind-15.21 {MatchPatterns procedure, checking "nearby"} -setup {
     frame .t.f -class Test -width 150 -height 100
     pack .t.f
@@ -1376,7 +1376,7 @@ test bind-15.21 {MatchPatterns procedure, checking "nearby"} -setup {
     return $x
 } -cleanup {
     destroy .t.f
-} -result {0}
+} -result 0
 test bind-15.22 {MatchPatterns procedure, time wrap-around} -setup {
     frame .t.f -class Test -width 150 -height 100
     pack .t.f
@@ -1391,7 +1391,7 @@ test bind-15.22 {MatchPatterns procedure, time wrap-around} -setup {
     return $x
 } -cleanup {
     destroy .t.f
-} -result {1}
+} -result 1
 test bind-15.23 {MatchPatterns procedure, time wrap-around} -setup {
     frame .t.f -class Test -width 150 -height 100
     pack .t.f
@@ -1406,7 +1406,7 @@ test bind-15.23 {MatchPatterns procedure, time wrap-around} -setup {
     return $x
 } -cleanup {
     destroy .t.f
-} -result {0}
+} -result 0
 test bind-15.24 {MatchPatterns procedure, virtual event} -setup {
     frame .t.f -class Test -width 150 -height 100
     pack .t.f
@@ -1479,7 +1479,7 @@ test bind-15.27 {MatchPatterns procedure, conflict resolution} -setup {
     return $x
 } -cleanup {
     destroy .t.f
-} -result {1}
+} -result 1
 test bind-15.28 {MatchPatterns procedure, conflict resolution} -setup {
     frame .t.f -class Test -width 150 -height 100
     pack .t.f
@@ -1493,7 +1493,7 @@ test bind-15.28 {MatchPatterns procedure, conflict resolution} -setup {
     return $x
 } -cleanup {
     destroy .t.f
-} -result {0}
+} -result 0
 test bind-15.29 {MatchPatterns procedure, conflict resolution} -setup {
     frame .t.f -class Test -width 150 -height 100
     pack .t.f
@@ -1525,7 +1525,7 @@ test bind-15.30 {MatchPatterns procedure, conflict resolution} -setup {
     return $x
 } -cleanup {
     destroy .t.f
-} -result {1}
+} -result 1
 test bind-15.31 {MatchPatterns procedure, conflict resolution} -setup {
     frame .t.f -class Test -width 150 -height 100
     pack .t.f
@@ -1539,7 +1539,7 @@ test bind-15.31 {MatchPatterns procedure, conflict resolution} -setup {
     return $x
 } -cleanup {
     destroy .t.f
-} -result {1}
+} -result 1
 test bind-15.32 {MatchPatterns procedure, conflict resolution} -setup {
     frame .t.f -class Test -width 150 -height 100
     pack .t.f
@@ -1553,7 +1553,7 @@ test bind-15.32 {MatchPatterns procedure, conflict resolution} -setup {
     return $x
 } -cleanup {
     destroy .t.f
-} -result {1}
+} -result 1
 test bind-15.33 {MatchPatterns procedure, conflict resolution} -setup {
     frame .t.f -class Test -width 150 -height 100
     pack .t.f
@@ -1601,7 +1601,7 @@ test bind-16.2 {ExpandPercents procedure} -setup {
     set x
 } -cleanup {
     destroy .t.f
-} -result {1234}
+} -result 1234
 test bind-16.3 {ExpandPercents procedure} -setup {
     frame .t.f -class Test -width 150 -height 100
     pack .t.f
@@ -1628,7 +1628,7 @@ test bind-16.4 {ExpandPercents procedure} -setup {
     set x
 } -cleanup {
     destroy .t.f
-} -result {3}
+} -result 3
 test bind-16.5 {ExpandPercents procedure} -setup {
     frame .t.f -class Test -width 150 -height 100
     pack .t.f
@@ -1641,7 +1641,7 @@ test bind-16.5 {ExpandPercents procedure} -setup {
     set x
 } -cleanup {
     destroy .t.f
-} -result {47}
+} -result 47
 test bind-16.6 {ExpandPercents procedure} -setup {
     frame .t.f -class Test -width 150 -height 100
     pack .t.f
@@ -1745,7 +1745,7 @@ test bind-16.13 {ExpandPercents procedure} -setup {
     return $x
 } -cleanup {
     destroy .t.f
-} -result {1}
+} -result 1
 test bind-16.14 {ExpandPercents procedure} -setup {
     frame .t.f -class Test -width 150 -height 100
     pack .t.f
@@ -1784,7 +1784,7 @@ test bind-16.16 {ExpandPercents procedure} -setup {
     set x
 } -cleanup {
     destroy .t.f
-} -result {146}
+} -result 146
 test bind-16.17 {ExpandPercents procedure} -setup {
     frame .t.f -class Test -width 150 -height 100
     pack .t.f
@@ -1850,7 +1850,7 @@ test bind-16.21 {ExpandPercents procedure} -setup {
     return $x
 } -cleanup {
     destroy .t.f
-} -result {1}
+} -result 1
 test bind-16.22 {ExpandPercents procedure} -setup {
     frame .t.f -class Test -width 150 -height 100
     pack .t.f
@@ -1863,7 +1863,7 @@ test bind-16.22 {ExpandPercents procedure} -setup {
     return $x
 } -cleanup {
     destroy .t.f
-} -result {1}
+} -result 1
 test bind-16.23 {ExpandPercents procedure} -setup {
     frame .t.f -class Test -width 150 -height 100
     pack .t.f
@@ -1876,7 +1876,7 @@ test bind-16.23 {ExpandPercents procedure} -setup {
     return $x
 } -cleanup {
     destroy .t.f
-} -result {1}
+} -result 1
 test bind-16.24 {ExpandPercents procedure} -setup {
     frame .t.f -class Test -width 150 -height 100
     pack .t.f
@@ -1916,7 +1916,7 @@ test bind-16.26 {ExpandPercents procedure} -setup {
     set x
 } -cleanup {
     destroy .t.f
-} -result {1402}
+} -result 1402
 test bind-16.27 {ExpandPercents procedure} -setup {
     frame .t.f -class Test -width 150 -height 100
     pack .t.f
@@ -1929,7 +1929,7 @@ test bind-16.27 {ExpandPercents procedure} -setup {
     set x
 } -cleanup {
     destroy .t.f
-} -result {1023}
+} -result 1023
 test bind-16.28 {ExpandPercents procedure} -setup {
     frame .t.f -class Test -width 150 -height 100
     pack .t.f
@@ -1982,7 +1982,7 @@ test bind-16.31 {ExpandPercents procedure} -setup {
     set x
 } -cleanup {
     destroy .t.f
-} -result {4294}
+} -result 4294
 test bind-16.32 {ExpandPercents procedure} -setup {
     frame .t.f -class Test -width 150 -height 100
     pack .t.f
@@ -2061,7 +2061,7 @@ test bind-16.36 {ExpandPercents procedure} -setup {
     set x
 } -cleanup {
     destroy .t.f
-} -result {24}
+} -result 24
 test bind-16.37 {ExpandPercents procedure} -setup {
     frame .t.f -class Test -width 150 -height 100
     pack .t.f
@@ -2074,7 +2074,7 @@ test bind-16.37 {ExpandPercents procedure} -setup {
     return $x
 } -cleanup {
     destroy .t.f
-} -result {1}
+} -result 1
 test bind-16.38 {ExpandPercents procedure} -constraints {
     nonPortable
 } -setup {
@@ -2109,7 +2109,7 @@ test bind-16.39 {ExpandPercents procedure} -setup {
     set x
 } -cleanup {
     destroy .t.f
-} -result {32}
+} -result 32
 test bind-16.40 {ExpandPercents procedure} -setup {
     frame .t.f -class Test -width 150 -height 100
     pack .t.f
@@ -2135,7 +2135,7 @@ test bind-16.41 {ExpandPercents procedure} -setup {
     set x
 } -cleanup {
     destroy .t.f
-} -result {2}
+} -result 2
 test bind-16.42 {ExpandPercents procedure} -setup {
     frame .t.f -class Test -width 150 -height 100
     pack .t.f
@@ -2321,7 +2321,7 @@ test bind-17.16 {event command: generate} -setup {
     set x
 } -cleanup {
     destroy .t.f
-} -result {1}
+} -result 1
 test bind-17.17 {event command: generate} -setup {
     frame .t.f -class Test -width 150 -height 100
     pack .t.f
@@ -2463,7 +2463,7 @@ test bind-19.11 {DeleteVirtualEvent procedure: owned by 1, only} -setup {
     set x
 } -cleanup {
     destroy .t.f
-} -result {101}
+} -result 101
 test bind-19.12 {DeleteVirtualEvent procedure: owned by 1, first in chain} -setup {
     frame .t.f -class Test -width 150 -height 100
     pack .t.f
@@ -2801,7 +2801,7 @@ test bind-22.11 {HandleEventGenerate} -setup {
     set x
 } -cleanup {
     destroy .t.f
-} -result {1}
+} -result 1
 test bind-22.12 {HandleEventGenerate} -setup {
     frame .t.f -class Test -width 150 -height 100
     pack .t.f
@@ -2814,7 +2814,7 @@ test bind-22.12 {HandleEventGenerate} -setup {
     set x
 } -cleanup {
     destroy .t.f
-} -result {4}
+} -result 4
 test bind-22.13 {HandleEventGenerate} -setup {
     frame .t.f -class Test -width 150 -height 100
     pack .t.f
@@ -2828,7 +2828,7 @@ test bind-22.13 {HandleEventGenerate} -setup {
     set x
 } -cleanup {
     destroy .t.f
-} -result {100}
+} -result 100
 test bind-22.14 {HandleEventGenerate} -setup {
     frame .t.f -class Test -width 150 -height 100
     pack .t.f
@@ -2984,7 +2984,7 @@ test bind-22.25 {HandleEventGenerate: options <Configure> -borderwidth 2i} -setu
     expr {[winfo pixels .t.f 2i] eq $x}
 } -cleanup {
     destroy .t.f
-} -result {1}
+} -result 1
 
 test bind-22.26 {HandleEventGenerate: options <Key> -borderwidth 2i} -setup {
     frame .t.f -class Test -width 150 -height 100
@@ -3078,7 +3078,7 @@ test bind-22.32 {HandleEventGenerate: options <Expose> -count 20} -setup {
     return $x
 } -cleanup {
     destroy .t.f
-} -result {20}
+} -result 20
 
 test bind-22.33 {HandleEventGenerate: options <Key> -count 20} -setup {
     frame .t.f -class Test -width 150 -height 100
@@ -3186,7 +3186,7 @@ test bind-22.39 {HandleEventGenerate: options <Enter> -focus 1} -setup {
     return $x
 } -cleanup {
     destroy .t.f
-} -result {1}
+} -result 1
 
 test bind-22.40 {HandleEventGenerate: options <Key> -focus 1} -setup {
     frame .t.f -class Test -width 150 -height 100
@@ -3226,7 +3226,7 @@ test bind-22.42 {HandleEventGenerate: options <Expose> -height 2i} -setup {
     expr {$x eq [winfo pixels .t.f 2i]}
 } -cleanup {
     destroy .t.f
-} -result {1}
+} -result 1
 
 test bind-22.43 {HandleEventGenerate: options <Configure> -height 2i} -setup {
     frame .t.f -class Test -width 150 -height 100
@@ -3240,7 +3240,7 @@ test bind-22.43 {HandleEventGenerate: options <Configure> -height 2i} -setup {
     expr {$x eq [winfo pixels .t.f 2i]}
 } -cleanup {
     destroy .t.f
-} -result {1}
+} -result 1
 
 test bind-22.44 {HandleEventGenerate: options <Key> -height 2i} -setup {
     frame .t.f -class Test -width 150 -height 100
@@ -3280,7 +3280,7 @@ test bind-22.46 {HandleEventGenerate: options <Key> -keycode 20} -setup {
     return $x
 } -cleanup {
     destroy .t.f
-} -result {20}
+} -result 20
 
 test bind-22.47 {HandleEventGenerate: options <Button> -keycode 20} -setup {
     frame .t.f -class Test -width 150 -height 100
@@ -3413,7 +3413,7 @@ test bind-22.56 {HandleEventGenerate: options <Map> -override 1} -setup {
     return $x
 } -cleanup {
     destroy .t.f
-} -result {1}
+} -result 1
 
 test bind-22.57 {HandleEventGenerate: options <Reparent> -override 1} -setup {
     frame .t.f -class Test -width 150 -height 100
@@ -3427,7 +3427,7 @@ test bind-22.57 {HandleEventGenerate: options <Reparent> -override 1} -setup {
     return $x
 } -cleanup {
     destroy .t.f
-} -result {1}
+} -result 1
 
 test bind-22.58 {HandleEventGenerate: options <Configure> -override 1} -setup {
     frame .t.f -class Test -width 150 -height 100
@@ -3441,7 +3441,7 @@ test bind-22.58 {HandleEventGenerate: options <Configure> -override 1} -setup {
     return $x
 } -cleanup {
     destroy .t.f
-} -result {1}
+} -result 1
 
 test bind-22.59 {HandleEventGenerate: options <Key> -override 1} -setup {
     frame .t.f -class Test -width 150 -height 100
@@ -3521,7 +3521,7 @@ test bind-22.64 {HandleEventGenerate: options <Key> -root .t} -setup {
     expr {[winfo id .t] eq $x}
 } -cleanup {
     destroy .t.f
-} -result {1}
+} -result 1
 
 test bind-22.65 {HandleEventGenerate: options <Key> -root xyz} -setup {
     frame .t.f -class Test -width 150 -height 100
@@ -3548,7 +3548,7 @@ test bind-22.66 {HandleEventGenerate: options <Key> -root [winfo id .t]} -setup
     expr {[winfo id .t] eq $x}
 } -cleanup {
     destroy .t.f
-} -result {1}
+} -result 1
 
 test bind-22.67 {HandleEventGenerate: options <Button> -root .t} -setup {
     frame .t.f -class Test -width 150 -height 100
@@ -3562,7 +3562,7 @@ test bind-22.67 {HandleEventGenerate: options <Button> -root .t} -setup {
     expr {[winfo id .t] eq $x}
 } -cleanup {
     destroy .t.f
-} -result {1}
+} -result 1
 
 test bind-22.68 {HandleEventGenerate: options <ButtonRelease> -root .t} -setup {
     frame .t.f -class Test -width 150 -height 100
@@ -3576,7 +3576,7 @@ test bind-22.68 {HandleEventGenerate: options <ButtonRelease> -root .t} -setup {
     expr {[winfo id .t] eq $x}
 } -cleanup {
     destroy .t.f
-} -result {1}
+} -result 1
 
 test bind-22.69 {HandleEventGenerate: options <Motion> -root .t} -setup {
     frame .t.f -class Test -width 150 -height 100
@@ -3590,7 +3590,7 @@ test bind-22.69 {HandleEventGenerate: options <Motion> -root .t} -setup {
     expr {[winfo id .t] eq $x}
 } -cleanup {
     destroy .t.f
-} -result {1}
+} -result 1
 
 test bind-22.70 {HandleEventGenerate: options <<Paste>> -root .t} -setup {
     frame .t.f -class Test -width 150 -height 100
@@ -3604,7 +3604,7 @@ test bind-22.70 {HandleEventGenerate: options <<Paste>> -root .t} -setup {
     expr {[winfo id .t] eq $x}
 } -cleanup {
     destroy .t.f
-} -result {1}
+} -result 1
 
 test bind-22.71 {HandleEventGenerate: options <Enter> -root .t} -setup {
     frame .t.f -class Test -width 150 -height 100
@@ -3618,7 +3618,7 @@ test bind-22.71 {HandleEventGenerate: options <Enter> -root .t} -setup {
     expr {[winfo id .t] eq $x}
 } -cleanup {
     destroy .t.f
-} -result {1}
+} -result 1
 
 test bind-22.72 {HandleEventGenerate: options <Configure> -root .t} -setup {
     frame .t.f -class Test -width 150 -height 100
@@ -3658,7 +3658,7 @@ test bind-22.74 {HandleEventGenerate: options <Key> -rootx 2i} -setup {
     expr {[winfo pixels .t.f 2i] eq $x}
 } -cleanup {
     destroy .t.f
-} -result {1}
+} -result 1
 
 test bind-22.75 {HandleEventGenerate: options <Button> -rootx 2i} -setup {
     frame .t.f -class Test -width 150 -height 100
@@ -3672,7 +3672,7 @@ test bind-22.75 {HandleEventGenerate: options <Button> -rootx 2i} -setup {
     expr {[winfo pixels .t.f 2i] eq $x}
 } -cleanup {
     destroy .t.f
-} -result {1}
+} -result 1
 
 test bind-22.76 {HandleEventGenerate: options <ButtonRelease> -rootx 2i} -setup {
     frame .t.f -class Test -width 150 -height 100
@@ -3686,7 +3686,7 @@ test bind-22.76 {HandleEventGenerate: options <ButtonRelease> -rootx 2i} -setup
     expr {[winfo pixels .t.f 2i] eq $x}
 } -cleanup {
     destroy .t.f
-} -result {1}
+} -result 1
 
 test bind-22.77 {HandleEventGenerate: options <Motion> -rootx 2i} -setup {
     frame .t.f -class Test -width 150 -height 100
@@ -3700,7 +3700,7 @@ test bind-22.77 {HandleEventGenerate: options <Motion> -rootx 2i} -setup {
     expr {[winfo pixels .t.f 2i] eq $x}
 } -cleanup {
     destroy .t.f
-} -result {1}
+} -result 1
 
 test bind-22.78 {HandleEventGenerate: options <<Paste>> -rootx 2i} -setup {
     frame .t.f -class Test -width 150 -height 100
@@ -3714,7 +3714,7 @@ test bind-22.78 {HandleEventGenerate: options <<Paste>> -rootx 2i} -setup {
     expr {[winfo pixels .t.f 2i] eq $x}
 } -cleanup {
     destroy .t.f
-} -result {1}
+} -result 1
 
 test bind-22.79 {HandleEventGenerate: options <Enter> -rootx 2i} -setup {
     frame .t.f -class Test -width 150 -height 100
@@ -3728,7 +3728,7 @@ test bind-22.79 {HandleEventGenerate: options <Enter> -rootx 2i} -setup {
     expr {[winfo pixels .t.f 2i] eq $x}
 } -cleanup {
     destroy .t.f
-} -result {1}
+} -result 1
 
 test bind-22.80 {HandleEventGenerate: options <Configure> -rootx 2i} -setup {
     frame .t.f -class Test -width 150 -height 100
@@ -3768,7 +3768,7 @@ test bind-22.82 {HandleEventGenerate: options <Key> -rooty 2i} -setup {
     expr {[winfo pixels .t.f 2i] eq $x}
 } -cleanup {
     destroy .t.f
-} -result {1}
+} -result 1
 
 test bind-22.83 {HandleEventGenerate: options <Button> -rooty 2i} -setup {
     frame .t.f -class Test -width 150 -height 100
@@ -3782,7 +3782,7 @@ test bind-22.83 {HandleEventGenerate: options <Button> -rooty 2i} -setup {
     expr {[winfo pixels .t.f 2i] eq $x}
 } -cleanup {
     destroy .t.f
-} -result {1}
+} -result 1
 
 test bind-22.84 {HandleEventGenerate: options <ButtonRelease> -rooty 2i} -setup {
     frame .t.f -class Test -width 150 -height 100
@@ -3796,7 +3796,7 @@ test bind-22.84 {HandleEventGenerate: options <ButtonRelease> -rooty 2i} -setup
     expr {[winfo pixels .t.f 2i] eq $x}
 } -cleanup {
     destroy .t.f
-} -result {1}
+} -result 1
 
 test bind-22.85 {HandleEventGenerate: options <Motion> -rooty 2i} -setup {
     frame .t.f -class Test -width 150 -height 100
@@ -3810,7 +3810,7 @@ test bind-22.85 {HandleEventGenerate: options <Motion> -rooty 2i} -setup {
     expr {[winfo pixels .t.f 2i] eq $x}
 } -cleanup {
     destroy .t.f
-} -result {1}
+} -result 1
 
 test bind-22.86 {HandleEventGenerate: options <<Paste>> -rooty 2i} -setup {
     frame .t.f -class Test -width 150 -height 100
@@ -3824,7 +3824,7 @@ test bind-22.86 {HandleEventGenerate: options <<Paste>> -rooty 2i} -setup {
     expr {[winfo pixels .t.f 2i] eq $x}
 } -cleanup {
     destroy .t.f
-} -result {1}
+} -result 1
 
 test bind-22.87 {HandleEventGenerate: options <Enter> -rooty 2i} -setup {
     frame .t.f -class Test -width 150 -height 100
@@ -3838,7 +3838,7 @@ test bind-22.87 {HandleEventGenerate: options <Enter> -rooty 2i} -setup {
     expr {[winfo pixels .t.f 2i] eq $x}
 } -cleanup {
     destroy .t.f
-} -result {1}
+} -result 1
 
 test bind-22.88 {HandleEventGenerate: options <Configure> -rooty 2i} -setup {
     frame .t.f -class Test -width 150 -height 100
@@ -3878,7 +3878,7 @@ test bind-22.90 {HandleEventGenerate: options <Key> -sendevent 1} -setup {
     return $x
 } -cleanup {
     destroy .t.f
-} -result {1}
+} -result 1
 
 test bind-22.91 {HandleEventGenerate: options <Key> -sendevent yes} -setup {
     frame .t.f -class Test -width 150 -height 100
@@ -3892,7 +3892,7 @@ test bind-22.91 {HandleEventGenerate: options <Key> -sendevent yes} -setup {
     return $x
 } -cleanup {
     destroy .t.f
-} -result {1}
+} -result 1
 
 test bind-22.92 {HandleEventGenerate: options <Key> -sendevent 43} -setup {
     frame .t.f -class Test -width 150 -height 100
@@ -3906,7 +3906,7 @@ test bind-22.92 {HandleEventGenerate: options <Key> -sendevent 43} -setup {
     return $x
 } -cleanup {
     destroy .t.f
-} -result {1}
+} -result 1
 
 test bind-22.93 {HandleEventGenerate: options <Key> -serial xyz} -setup {
     frame .t.f -class Test -width 150 -height 100
@@ -3933,7 +3933,7 @@ test bind-22.94 {HandleEventGenerate: options <Key> -serial 100} -setup {
     return $x
 } -cleanup {
     destroy .t.f
-} -result {100}
+} -result 100
 
 test bind-22.95 {HandleEventGenerate: options <Key> -state xyz} -setup {
     frame .t.f -class Test -width 150 -height 100
@@ -3960,7 +3960,7 @@ test bind-22.96 {HandleEventGenerate: options <Key> -state 1} -setup {
     return $x
 } -cleanup {
     destroy .t.f
-} -result {1}
+} -result 1
 
 test bind-22.97 {HandleEventGenerate: options <Button> -state 1025} -setup {
     frame .t.f -class Test -width 150 -height 100
@@ -3974,7 +3974,7 @@ test bind-22.97 {HandleEventGenerate: options <Button> -state 1025} -setup {
     return $x
 } -cleanup {
     destroy .t.f
-} -result {1025}
+} -result 1025
 
 test bind-22.98 {HandleEventGenerate: options <ButtonRelease> -state 1025} -setup {
     frame .t.f -class Test -width 150 -height 100
@@ -3988,7 +3988,7 @@ test bind-22.98 {HandleEventGenerate: options <ButtonRelease> -state 1025} -setu
     return $x
 } -cleanup {
     destroy .t.f
-} -result {1025}
+} -result 1025
 
 test bind-22.99 {HandleEventGenerate: options <Motion> -state 1} -setup {
     frame .t.f -class Test -width 150 -height 100
@@ -4002,7 +4002,7 @@ test bind-22.99 {HandleEventGenerate: options <Motion> -state 1} -setup {
     return $x
 } -cleanup {
     destroy .t.f
-} -result {1}
+} -result 1
 
 test bind-22.100 {HandleEventGenerate: options <<Paste>> -state 1} -setup {
     frame .t.f -class Test -width 150 -height 100
@@ -4016,7 +4016,7 @@ test bind-22.100 {HandleEventGenerate: options <<Paste>> -state 1} -setup {
     return $x
 } -cleanup {
     destroy .t.f
-} -result {1}
+} -result 1
 
 test bind-22.101 {HandleEventGenerate: options <Enter> -state 1} -setup {
     frame .t.f -class Test -width 150 -height 100
@@ -4030,7 +4030,7 @@ test bind-22.101 {HandleEventGenerate: options <Enter> -state 1} -setup {
     return $x
 } -cleanup {
     destroy .t.f
-} -result {1}
+} -result 1
 
 test bind-22.102 {HandleEventGenerate: options <Visibility> -state xyz} -setup {
     frame .t.f -class Test -width 150 -height 100
@@ -4097,7 +4097,7 @@ test bind-22.106 {HandleEventGenerate: options <Key> -subwindow .t} -setup {
     expr {[winfo id .t] eq $x}
 } -cleanup {
     destroy .t.f
-} -result {1}
+} -result 1
 
 test bind-22.107 {HandleEventGenerate: options <Key> -subwindow xyz} -setup {
     frame .t.f -class Test -width 150 -height 100
@@ -4124,7 +4124,7 @@ test bind-22.108 {HandleEventGenerate: options <Key> -subwindow [winfo id .t]} -
     expr {[winfo id .t] eq $x}
 } -cleanup {
     destroy .t.f
-} -result {1}
+} -result 1
 
 test bind-22.109 {HandleEventGenerate: options <Button> -subwindow .t} -setup {
     frame .t.f -class Test -width 150 -height 100
@@ -4138,7 +4138,7 @@ test bind-22.109 {HandleEventGenerate: options <Button> -subwindow .t} -setup {
     expr {[winfo id .t] eq $x}
 } -cleanup {
     destroy .t.f
-} -result {1}
+} -result 1
 
 test bind-22.110 {HandleEventGenerate: options <ButtonRelease> -subwindow .t} -setup {
     frame .t.f -class Test -width 150 -height 100
@@ -4152,7 +4152,7 @@ test bind-22.110 {HandleEventGenerate: options <ButtonRelease> -subwindow .t} -s
     expr {[winfo id .t] eq $x}
 } -cleanup {
     destroy .t.f
-} -result {1}
+} -result 1
 
 test bind-22.111 {HandleEventGenerate: options <Motion> -subwindow .t} -setup {
     frame .t.f -class Test -width 150 -height 100
@@ -4166,7 +4166,7 @@ test bind-22.111 {HandleEventGenerate: options <Motion> -subwindow .t} -setup {
     expr {[winfo id .t] eq $x}
 } -cleanup {
     destroy .t.f
-} -result {1}
+} -result 1
 
 test bind-22.112 {HandleEventGenerate: options <<Paste>> -subwindow .t} -setup {
     frame .t.f -class Test -width 150 -height 100
@@ -4180,7 +4180,7 @@ test bind-22.112 {HandleEventGenerate: options <<Paste>> -subwindow .t} -setup {
     expr {[winfo id .t] eq $x}
 } -cleanup {
     destroy .t.f
-} -result {1}
+} -result 1
 
 test bind-22.113 {HandleEventGenerate: options <Enter> -subwindow .t} -setup {
     frame .t.f -class Test -width 150 -height 100
@@ -4194,7 +4194,7 @@ test bind-22.113 {HandleEventGenerate: options <Enter> -subwindow .t} -setup {
     expr {[winfo id .t] eq $x}
 } -cleanup {
     destroy .t.f
-} -result {1}
+} -result 1
 
 test bind-22.114 {HandleEventGenerate: options <Configure> -subwindow .t} -setup {
     frame .t.f -class Test -width 150 -height 100
@@ -4234,7 +4234,7 @@ test bind-22.116 {HandleEventGenerate: options <Key> -time 100} -setup {
     return $x
 } -cleanup {
     destroy .t.f
-} -result {100}
+} -result 100
 
 test bind-22.117 {HandleEventGenerate: options <Button> -time 100} -setup {
     frame .t.f -class Test -width 150 -height 100
@@ -4248,7 +4248,7 @@ test bind-22.117 {HandleEventGenerate: options <Button> -time 100} -setup {
     return $x
 } -cleanup {
     destroy .t.f
-} -result {100}
+} -result 100
 
 test bind-22.118 {HandleEventGenerate: options <ButtonRelease> -time 100} -setup {
     frame .t.f -class Test -width 150 -height 100
@@ -4262,7 +4262,7 @@ test bind-22.118 {HandleEventGenerate: options <ButtonRelease> -time 100} -setup
     return $x
 } -cleanup {
     destroy .t.f
-} -result {100}
+} -result 100
 
 test bind-22.119 {HandleEventGenerate: options <Motion> -time 100} -setup {
     frame .t.f -class Test -width 150 -height 100
@@ -4276,7 +4276,7 @@ test bind-22.119 {HandleEventGenerate: options <Motion> -time 100} -setup {
     return $x
 } -cleanup {
     destroy .t.f
-} -result {100}
+} -result 100
 
 test bind-22.120 {HandleEventGenerate: options <<Paste>> -time 100} -setup {
     frame .t.f -class Test -width 150 -height 100
@@ -4290,7 +4290,7 @@ test bind-22.120 {HandleEventGenerate: options <<Paste>> -time 100} -setup {
     return $x
 } -cleanup {
     destroy .t.f
-} -result {100}
+} -result 100
 
 test bind-22.121 {HandleEventGenerate: options <Enter> -time 100} -setup {
     frame .t.f -class Test -width 150 -height 100
@@ -4304,7 +4304,7 @@ test bind-22.121 {HandleEventGenerate: options <Enter> -time 100} -setup {
     return $x
 } -cleanup {
     destroy .t.f
-} -result {100}
+} -result 100
 
 test bind-22.122 {HandleEventGenerate: options <Property> -time 100} -setup {
     frame .t.f -class Test -width 150 -height 100
@@ -4318,7 +4318,7 @@ test bind-22.122 {HandleEventGenerate: options <Property> -time 100} -setup {
     return $x
 } -cleanup {
     destroy .t.f
-} -result {100}
+} -result 100
 
 test bind-22.123 {HandleEventGenerate: options <Configure> -time 100} -setup {
     frame .t.f -class Test -width 150 -height 100
@@ -4358,7 +4358,7 @@ test bind-22.125 {HandleEventGenerate: options <Expose> -width 2i} -setup {
     expr {[winfo pixels .t.f 2i] eq $x}
 } -cleanup {
     destroy .t.f
-} -result {1}
+} -result 1
 
 test bind-22.126 {HandleEventGenerate: options <Configure> -width 2i} -setup {
     frame .t.f -class Test -width 150 -height 100
@@ -4372,7 +4372,7 @@ test bind-22.126 {HandleEventGenerate: options <Configure> -width 2i} -setup {
     expr {[winfo pixels .t.f 2i] eq $x}
 } -cleanup {
     destroy .t.f
-} -result {1}
+} -result 1
 
 test bind-22.127 {HandleEventGenerate: options <Key> -width 2i} -setup {
     frame .t.f -class Test -width 150 -height 100
@@ -4563,7 +4563,7 @@ test bind-22.140 {HandleEventGenerate: options <Key> -x 2i} -setup {
     expr {[winfo pixels .t.f 2i] eq $x}
 } -cleanup {
     destroy .t.f
-} -result {1}
+} -result 1
 
 test bind-22.141 {HandleEventGenerate: options <Button> -x 2i} -setup {
     frame .t.f -class Test -width 150 -height 100
@@ -4577,7 +4577,7 @@ test bind-22.141 {HandleEventGenerate: options <Button> -x 2i} -setup {
     expr {[winfo pixels .t.f 2i] eq $x}
 } -cleanup {
     destroy .t.f
-} -result {1}
+} -result 1
 
 test bind-22.142 {HandleEventGenerate: options <ButtonRelease> -x 2i} -setup {
     frame .t.f -class Test -width 150 -height 100
@@ -4591,7 +4591,7 @@ test bind-22.142 {HandleEventGenerate: options <ButtonRelease> -x 2i} -setup {
     expr {[winfo pixels .t.f 2i] eq $x}
 } -cleanup {
     destroy .t.f
-} -result {1}
+} -result 1
 
 test bind-22.143 {HandleEventGenerate: options <Motion> -x 2i} -setup {
     frame .t.f -class Test -width 150 -height 100
@@ -4605,7 +4605,7 @@ test bind-22.143 {HandleEventGenerate: options <Motion> -x 2i} -setup {
     expr {[winfo pixels .t.f 2i] eq $x}
 } -cleanup {
     destroy .t.f
-} -result {1}
+} -result 1
 
 test bind-22.144 {HandleEventGenerate: options <<Paste>> -x 2i} -setup {
     frame .t.f -class Test -width 150 -height 100
@@ -4619,7 +4619,7 @@ test bind-22.144 {HandleEventGenerate: options <<Paste>> -x 2i} -setup {
     expr {[winfo pixels .t.f 2i] eq $x}
 } -cleanup {
     destroy .t.f
-} -result {1}
+} -result 1
 
 test bind-22.145 {HandleEventGenerate: options <Enter> -x 2i} -setup {
     frame .t.f -class Test -width 150 -height 100
@@ -4633,7 +4633,7 @@ test bind-22.145 {HandleEventGenerate: options <Enter> -x 2i} -setup {
     expr {[winfo pixels .t.f 2i] eq $x}
 } -cleanup {
     destroy .t.f
-} -result {1}
+} -result 1
 
 test bind-22.146 {HandleEventGenerate: options <Expose> -x 2i} -setup {
     frame .t.f -class Test -width 150 -height 100
@@ -4647,7 +4647,7 @@ test bind-22.146 {HandleEventGenerate: options <Expose> -x 2i} -setup {
     expr {[winfo pixels .t.f 2i] eq $x}
 } -cleanup {
     destroy .t.f
-} -result {1}
+} -result 1
 
 test bind-22.147 {HandleEventGenerate: options <Configure> -x 2i} -setup {
     frame .t.f -class Test -width 150 -height 100
@@ -4661,7 +4661,7 @@ test bind-22.147 {HandleEventGenerate: options <Configure> -x 2i} -setup {
     expr {[winfo pixels .t.f 2i] eq $x}
 } -cleanup {
     destroy .t.f
-} -result {1}
+} -result 1
 
 test bind-22.148 {HandleEventGenerate: options <Gravity> -x 2i} -setup {
     frame .t.f -class Test -width 150 -height 100
@@ -4675,7 +4675,7 @@ test bind-22.148 {HandleEventGenerate: options <Gravity> -x 2i} -setup {
     expr {[winfo pixels .t.f 2i] eq $x}
 } -cleanup {
     destroy .t.f
-} -result {1}
+} -result 1
 
 test bind-22.149 {HandleEventGenerate: options <Reparent> -x 2i} -setup {
     frame .t.f -class Test -width 150 -height 100
@@ -4689,7 +4689,7 @@ test bind-22.149 {HandleEventGenerate: options <Reparent> -x 2i} -setup {
     expr {[winfo pixels .t.f 2i] eq $x}
 } -cleanup {
     destroy .t.f
-} -result {1}
+} -result 1
 
 test bind-22.150 {HandleEventGenerate: options <Map> -x 2i} -setup {
     frame .t.f -class Test -width 150 -height 100
@@ -4729,7 +4729,7 @@ test bind-22.152 {HandleEventGenerate: options <Key> -y 2i} -setup {
     expr {[winfo pixels .t.f 2i] eq $x}
 } -cleanup {
     destroy .t.f
-} -result {1}
+} -result 1
 
 test bind-22.153 {HandleEventGenerate: options <Button> -y 2i} -setup {
     frame .t.f -class Test -width 150 -height 100
@@ -4743,7 +4743,7 @@ test bind-22.153 {HandleEventGenerate: options <Button> -y 2i} -setup {
     expr {[winfo pixels .t.f 2i] eq $x}
 } -cleanup {
     destroy .t.f
-} -result {1}
+} -result 1
 
 test bind-22.154 {HandleEventGenerate: options <ButtonRelease> -y 2i} -setup {
     frame .t.f -class Test -width 150 -height 100
@@ -4757,7 +4757,7 @@ test bind-22.154 {HandleEventGenerate: options <ButtonRelease> -y 2i} -setup {
     expr {[winfo pixels .t.f 2i] eq $x}
 } -cleanup {
     destroy .t.f
-} -result {1}
+} -result 1
 
 test bind-22.155 {HandleEventGenerate: options <Motion> -y 2i} -setup {
     frame .t.f -class Test -width 150 -height 100
@@ -4771,7 +4771,7 @@ test bind-22.155 {HandleEventGenerate: options <Motion> -y 2i} -setup {
     expr {[winfo pixels .t.f 2i] eq $x}
 } -cleanup {
     destroy .t.f
-} -result {1}
+} -result 1
 
 test bind-22.156 {HandleEventGenerate: options <<Paste>> -y 2i} -setup {
     frame .t.f -class Test -width 150 -height 100
@@ -4785,7 +4785,7 @@ test bind-22.156 {HandleEventGenerate: options <<Paste>> -y 2i} -setup {
     expr {[winfo pixels .t.f 2i] eq $x}
 } -cleanup {
     destroy .t.f
-} -result {1}
+} -result 1
 
 test bind-22.157 {HandleEventGenerate: options <Enter> -y 2i} -setup {
     frame .t.f -class Test -width 150 -height 100
@@ -4799,7 +4799,7 @@ test bind-22.157 {HandleEventGenerate: options <Enter> -y 2i} -setup {
     expr {[winfo pixels .t.f 2i] eq $x}
 } -cleanup {
     destroy .t.f
-} -result {1}
+} -result 1
 
 test bind-22.158 {HandleEventGenerate: options <Expose> -y 2i} -setup {
     frame .t.f -class Test -width 150 -height 100
@@ -4813,7 +4813,7 @@ test bind-22.158 {HandleEventGenerate: options <Expose> -y 2i} -setup {
     expr {[winfo pixels .t.f 2i] eq $x}
 } -cleanup {
     destroy .t.f
-} -result {1}
+} -result 1
 
 test bind-22.159 {HandleEventGenerate: options <Configure> -y 2i} -setup {
     frame .t.f -class Test -width 150 -height 100
@@ -4827,7 +4827,7 @@ test bind-22.159 {HandleEventGenerate: options <Configure> -y 2i} -setup {
     expr {[winfo pixels .t.f 2i] eq $x}
 } -cleanup {
     destroy .t.f
-} -result {1}
+} -result 1
 
 test bind-22.160 {HandleEventGenerate: options <Gravity> -y 2i} -setup {
     frame .t.f -class Test -width 150 -height 100
@@ -4841,7 +4841,7 @@ test bind-22.160 {HandleEventGenerate: options <Gravity> -y 2i} -setup {
     expr {[winfo pixels .t.f 2i] eq $x}
 } -cleanup {
     destroy .t.f
-} -result {1}
+} -result 1
 
 test bind-22.161 {HandleEventGenerate: options <Reparent> -y 2i} -setup {
     frame .t.f -class Test -width 150 -height 100
@@ -4855,7 +4855,7 @@ test bind-22.161 {HandleEventGenerate: options <Reparent> -y 2i} -setup {
     expr {[winfo pixels .t.f 2i] eq $x}
 } -cleanup {
     destroy .t.f
-} -result {1}
+} -result 1
 
 test bind-22.162 {HandleEventGenerate: options <Map> -y 2i} -setup {
     frame .t.f -class Test -width 150 -height 100
@@ -6118,7 +6118,7 @@ test bind-30.2 {MouseWheel events} -setup {
     set x
 } -cleanup {
     destroy .t.f
-} -result {120}
+} -result 120
 test bind-30.3 {MouseWheel events} -setup {
     frame .t.f -class Test -width 150 -height 100
     pack .t.f
@@ -6414,7 +6414,7 @@ test bind-32.12 {don't detect repetition when window has changed} -setup {
 } -cleanup {
     destroy .t.f
     destroy .t.g
-} -result {1}
+} -result 1
 test bind-32.13 {don't detect repetition when window has changed} -setup {
     pack [frame .t.f]
     pack [frame .t.g]
@@ -6446,7 +6446,7 @@ test bind-32.14 {don't detect repetition when window has changed} -setup {
 } -cleanup {
     destroy .t.f
     destroy .t.g
-} -result {1}
+} -result 1
 test bind-32.15 {reset button state when destroying window} -setup {
     set x {}
 } -body {
@@ -6461,7 +6461,7 @@ test bind-32.15 {reset button state when destroying window} -setup {
     event generate .t.f <Button-1>
     destroy .t.f
     set x
-} -result {1}
+} -result 1
 
 test bind-33.1 {prefer longest match} -setup {
     pack [frame .t.f]
@@ -6521,7 +6521,7 @@ test bind-33.4 {prefer most specific event} -setup {
     set x
 } -cleanup {
     destroy .t.f
-} -result {11}
+} -result 11
 test bind-33.5 {prefer most specific event} -setup {
     pack [frame .t.f]
     focus -force .t.f
@@ -6535,7 +6535,7 @@ test bind-33.5 {prefer most specific event} -setup {
     set x
 } -cleanup {
     destroy .t.f
-} -result {11}
+} -result 11
 test bind-33.6 {prefer most specific event} -setup {
     pack [frame .t.f]
     focus -force .t.f
@@ -6553,7 +6553,7 @@ test bind-33.6 {prefer most specific event} -setup {
     set x
 } -cleanup {
     destroy .t.f
-} -result {1111}
+} -result 1111
 test bind-33.7 {prefer most specific event} -setup {
     pack [frame .t.f]
     focus -force .t.f
@@ -6567,7 +6567,7 @@ test bind-33.7 {prefer most specific event} -setup {
     set x
 } -cleanup {
     destroy .t.f
-} -result {1}
+} -result 1
 test bind-33.8 {prefer most specific event} -setup {
     pack [frame .t.f]
     focus -force .t.f
@@ -6582,7 +6582,7 @@ test bind-33.8 {prefer most specific event} -setup {
     set x
 } -cleanup {
     destroy .t.f
-} -result {1}
+} -result 1
 test bind-33.9 {prefer last in case of homogeneous equal patterns} -setup {
     pack [frame .t.f]
     focus -force .t.f
@@ -6704,6 +6704,104 @@ test bind-33.15 {prefer last in case of homogeneous equal patterns} -setup {
     # because both bindings are homogeneous equal, so the most recently defined
     # must be preferred.
 } -result {last}
+test bind-33.16 {simulate use of the keyboard to trigger a pattern sequence with modifier - bug [16ef161925]} -setup {
+    pack [frame .t.f]
+    focus -force .t.f
+    update
+    set x {}
+} -body {
+    bind .t.f <Escape><Control-c> { lappend x "Esc_Control-c" }
+    event generate .t.f <Escape>
+    event generate .t.f <Control_L>
+    event generate .t.f <Control_L>
+    event generate .t.f <Control_L>
+    event generate .t.f <Control-c>
+    set x
+} -cleanup {
+    destroy .t.f
+} -result {Esc_Control-c}
+test bind-33.17 {simulate use of the keyboard to trigger a pattern sequence with modifier - bug [16ef161925]} -setup {
+    pack [frame .t.f]
+    focus -force .t.f
+    update
+    set x {}
+} -body {
+    bind .t.f <Escape><Control-c> { lappend x "Esc_Control-c" }
+    bind .t.f <Escape><Control_L><Control-c> { lappend x "Esc_Ctrl_L_Control-c" }
+    event generate .t.f <Escape>
+    event generate .t.f <Control_L>
+    event generate .t.f <Control_L>
+    event generate .t.f <Control_L>
+    event generate .t.f <Control-c>
+    set x
+} -cleanup {
+    destroy .t.f
+} -result {Esc_Ctrl_L_Control-c}
+test bind-33.18 {simulate use of the keyboard to trigger a pattern sequence with modifier - bug [16ef161925]} -setup {
+    pack [frame .t.f]
+    focus -force .t.f
+    update
+    set x {}
+} -body {
+    bind .t.f <Escape><Control-c> { lappend x "Esc_Control-c" }
+    bind .t.f <Escape><Control_L><Control-c> { lappend x "Esc_Ctrl_L_Control-c" }
+    bind .t.f <Escape><Control_L><Control_L><Control-c> { lappend x "Esc_Ctrl_L(2)_Control-c" }
+    event generate .t.f <Escape>
+    event generate .t.f <Control_L>
+    event generate .t.f <Control_L>
+    event generate .t.f <Control_L>
+    event generate .t.f <Control-c>
+    set x
+} -cleanup {
+    destroy .t.f
+} -result {Esc_Ctrl_L(2)_Control-c}
+test bind-33.19 {simulate use of the keyboard to trigger a pattern sequence with modifier - bug [16ef161925]} -setup {
+    pack [frame .t.f]
+    focus -force .t.f
+    update
+    set x {}
+} -body {
+    bind .t.f <Escape><Control-c> { lappend x "Esc_Control-c" }
+    bind .t.f <Escape><KeyPress><KeyPress><Control-c> { lappend x "Esc_Key(2)_Control-c" }
+    event generate .t.f <Escape>
+    event generate .t.f <Alt_L>
+    event generate .t.f <Control_L>
+    event generate .t.f <Control-c>
+    set x
+} -cleanup {
+    destroy .t.f
+} -result {Esc_Key(2)_Control-c}
+test bind-33.20 {simulate use of the keyboard to trigger a pattern sequence with mixed Key and Button types - bug [16ef161925]} -setup {
+    pack [frame .t.f]
+    focus -force .t.f
+    update
+    set x {}
+} -body {
+    bind .t.f <Key-1><Button-1> { lappend x "1_Button1" }
+    event generate .t.f <Key-1>
+    event generate .t.f <KeyRelease-1>
+    event generate .t.f <Button-1>
+    set x
+} -cleanup {
+    destroy .t.f
+} -result {1_Button1}
+test bind-33.21 {simulate use of the keyboard to trigger a pattern sequence with mixed Key and Button types - bug [16ef161925]} -setup {
+    pack [frame .t.f]
+    focus -force .t.f
+    update
+    set x {}
+} -body {
+    bind .t.f <Key-1><Button-1> { lappend x "1_Button1" }
+    bind .t.f <Key-1><Button-1><Key-2> { lappend x "1_Button1_2" }
+    event generate .t.f <Key-1>
+    event generate .t.f <KeyRelease-1>
+    event generate .t.f <Button-1>
+    event generate .t.f <Key-2>
+    event generate .t.f <KeyRelease-2>
+    set x
+} -cleanup {
+    destroy .t.f
+} -result {1_Button1 1_Button1_2}
 
 test bind-34.1 {-warp works relatively to a window} -setup {
     toplevel .top
@@ -6737,7 +6835,7 @@ test bind-34.1 {-warp works relatively to a window} -setup {
     set res
 } -cleanup {
     destroy .top
-} -result {1}
+} -result 1
 test bind-34.2 {-warp works relatively to the screen} -setup {
 } -body {
     # Contrary to bind-34.1, we're directly checking screen coordinates
diff --git a/tests/busy.test b/tests/busy.test
index 001bb6c..6a1263f 100644
--- a/tests/busy.test
+++ b/tests/busy.test
@@ -350,14 +350,14 @@ test busy-6.1 {tk busy status} -returnCodes error -body {
 } -result {wrong # args: should be "tk busy status window"}
 test busy-6.2 {tk busy status non existing window} -body {
     tk busy status .f
-} -result {0}
+} -result 0
 test busy-6.3 {tk busy status non busy window} -setup {
     pack [frame .f]
 } -body {
     tk busy status .f
 } -cleanup {
     destroy .f
-} -result {0}
+} -result 0
 test busy-6.4 {tk busy status busy window} -setup {
     pack [frame .f]
     tk busy hold .f
@@ -367,7 +367,7 @@ test busy-6.4 {tk busy status busy window} -setup {
 } -cleanup {
     tk busy forget .f
     destroy .f
-} -result {1}
+} -result 1
 test busy-6.5 {tk busy status forgotten busy window} -setup {
     pack [frame .f]
     tk busy hold .f
@@ -377,7 +377,7 @@ test busy-6.5 {tk busy status forgotten busy window} -setup {
     tk busy status .f
 } -cleanup {
     destroy .f
-} -result {0}
+} -result 0
 
 test busy-7.1 {tk busy current no busy} -body {
     tk busy current
diff --git a/tests/button.test b/tests/button.test
index f3292b31..9a69b1b 100644
--- a/tests/button.test
+++ b/tests/button.test
@@ -334,7 +334,7 @@ test button-1.33 {configuration option: "bd" for label} -setup {
     .l cget -bd
 } -cleanup {
     destroy .l
-} -result {4}
+} -result 4
 test button-1.34 {configuration option: "bd" for label} -setup {
     label .l -borderwidth 2 -highlightthickness 2 -font {Helvetica -12 bold}
     pack .l
@@ -353,7 +353,7 @@ test button-1.35 {configuration option: "bd" for button} -setup {
     .b cget -bd
 } -cleanup {
     destroy .b
-} -result {4}
+} -result 4
 test button-1.36 {configuration option: "bd" for button} -setup {
     button .b -borderwidth 2 -highlightthickness 2 -font {Helvetica -12 bold}
     pack .b
@@ -372,7 +372,7 @@ test button-1.37 {configuration option: "bd" for checkbutton} -setup {
     .c cget -bd
 } -cleanup {
     destroy .c
-} -result {4}
+} -result 4
 test button-1.38 {configuration option: "bd" for checkbutton} -setup {
     checkbutton .c -borderwidth 2 -highlightthickness 2 -font {Helvetica -12 bold}
     pack .c
@@ -391,7 +391,7 @@ test button-1.39 {configuration option: "bd" for radiobutton} -setup {
     .r cget -bd
 } -cleanup {
     destroy .r
-} -result {4}
+} -result 4
 test button-1.40 {configuration option: "bd" for radiobutton} -setup {
     radiobutton .r -borderwidth 2 -highlightthickness 2 -font {Helvetica -12 bold}
     pack .r
@@ -1165,7 +1165,7 @@ test button-1.119 {configuration option: "height" for label} -setup {
     .l cget -height
 } -cleanup {
     destroy .l
-} -result {18}
+} -result 18
 test button-1.120 {configuration option: "height" for label} -setup {
     label .l -borderwidth 2 -highlightthickness 2 -font {Helvetica -12 bold}
     pack .l
@@ -1184,7 +1184,7 @@ test button-1.121 {configuration option: "height" for button} -setup {
     .b cget -height
 } -cleanup {
     destroy .b
-} -result {18}
+} -result 18
 test button-1.122 {configuration option: "height" for button} -setup {
     button .b -borderwidth 2 -highlightthickness 2 -font {Helvetica -12 bold}
     pack .b
@@ -1203,7 +1203,7 @@ test button-1.123 {configuration option: "height" for checkbutton} -setup {
     .c cget -height
 } -cleanup {
     destroy .c
-} -result {18}
+} -result 18
 test button-1.124 {configuration option: "height" for checkbutton} -setup {
     checkbutton .c -borderwidth 2 -highlightthickness 2 -font {Helvetica -12 bold}
     pack .c
@@ -1222,7 +1222,7 @@ test button-1.125 {configuration option: "height" for radiobutton} -setup {
     .r cget -height
 } -cleanup {
     destroy .r
-} -result {18}
+} -result 18
 test button-1.126 {configuration option: "height" for radiobutton} -setup {
     radiobutton .r -borderwidth 2 -highlightthickness 2 -font {Helvetica -12 bold}
     pack .r
@@ -1566,7 +1566,7 @@ test button-1.159 {configuration option: "indicatoron" for checkbutton} -setup {
     .c cget -indicatoron
 } -cleanup {
     destroy .c
-} -result {1}
+} -result 1
 test button-1.160 {configuration option: "indicatoron" for checkbutton} -setup {
     checkbutton .c -borderwidth 2 -highlightthickness 2 -font {Helvetica -12 bold}
     pack .c
@@ -1585,7 +1585,7 @@ test button-1.161 {configuration option: "indicatoron" for radiobutton} -setup {
     .r cget -indicatoron
 } -cleanup {
     destroy .r
-} -result {1}
+} -result 1
 test button-1.162 {configuration option: "indicatoron" for radiobutton} -setup {
     radiobutton .r -borderwidth 2 -highlightthickness 2 -font {Helvetica -12 bold}
     pack .r
@@ -1955,7 +1955,7 @@ test button-1.199 {configuration option: "repeatdelay" for button} -setup {
     .b cget -repeatdelay
 } -cleanup {
     destroy .b
-} -result {100}
+} -result 100
 test button-1.200 {configuration option: "repeatdelay" for button} -setup {
     button .b -borderwidth 2 -highlightthickness 2 -font {Helvetica -12 bold}
     pack .b
@@ -1975,7 +1975,7 @@ test button-1.201 {configuration option: "repeatinterval" for button} -setup {
     .b cget -repeatinterval
 } -cleanup {
     destroy .b
-} -result {100}
+} -result 100
 test button-1.202 {configuration option: "repeatinterval" for button} -setup {
     button .b -borderwidth 2 -highlightthickness 2 -font {Helvetica -12 bold}
     pack .b
@@ -2405,7 +2405,7 @@ test button-1.243 {configuration option: "underline" for label} -setup {
     .l cget -underline
 } -cleanup {
     destroy .l
-} -result {5}
+} -result 5
 test button-1.244 {configuration option: "underline" for label} -setup {
     label .l -borderwidth 2 -highlightthickness 2 -font {Helvetica -12 bold}
     pack .l
@@ -2424,7 +2424,7 @@ test button-1.245 {configuration option: "underline" for button} -setup {
     .b cget -underline
 } -cleanup {
     destroy .b
-} -result {5}
+} -result 5
 test button-1.246 {configuration option: "underline" for button} -setup {
     button .b -borderwidth 2 -highlightthickness 2 -font {Helvetica -12 bold}
     pack .b
@@ -2443,7 +2443,7 @@ test button-1.247 {configuration option: "underline" for checkbutton} -setup {
     .c cget -underline
 } -cleanup {
     destroy .c
-} -result {5}
+} -result 5
 test button-1.248 {configuration option: "underline" for checkbutton} -setup {
     checkbutton .c -borderwidth 2 -highlightthickness 2 -font {Helvetica -12 bold}
     pack .c
@@ -2462,7 +2462,7 @@ test button-1.249 {configuration option: "underline" for radiobutton} -setup {
     .r cget -underline
 } -cleanup {
     destroy .r
-} -result {5}
+} -result 5
 test button-1.250 {configuration option: "underline" for radiobutton} -setup {
     radiobutton .r -borderwidth 2 -highlightthickness 2 -font {Helvetica -12 bold}
     pack .r
@@ -2514,7 +2514,7 @@ test button-1.254 {configuration option: "width" for label} -setup {
     .l cget -width
 } -cleanup {
     destroy .l
-} -result {402}
+} -result 402
 test button-1.255 {configuration option: "width" for label} -setup {
     label .l -borderwidth 2 -highlightthickness 2 -font {Helvetica -12 bold}
     pack .l
@@ -2533,7 +2533,7 @@ test button-1.256 {configuration option: "width" for button} -setup {
     .b cget -width
 } -cleanup {
     destroy .b
-} -result {402}
+} -result 402
 test button-1.257 {configuration option: "width" for button} -setup {
     button .b -borderwidth 2 -highlightthickness 2 -font {Helvetica -12 bold}
     pack .b
@@ -2552,7 +2552,7 @@ test button-1.258 {configuration option: "width" for checkbutton} -setup {
     .c cget -width
 } -cleanup {
     destroy .c
-} -result {402}
+} -result 402
 test button-1.259 {configuration option: "width" for checkbutton} -setup {
     checkbutton .c -borderwidth 2 -highlightthickness 2 -font {Helvetica -12 bold}
     pack .c
@@ -2571,7 +2571,7 @@ test button-1.260 {configuration option: "width" for radiobutton} -setup {
     .r cget -width
 } -cleanup {
     destroy .r
-} -result {402}
+} -result 402
 test button-1.261 {configuration option: "width" for radiobutton} -setup {
     radiobutton .r -borderwidth 2 -highlightthickness 2 -font {Helvetica -12 bold}
     pack .r
@@ -2591,7 +2591,7 @@ test button-1.262 {configuration option: "wraplength" for label} -setup {
     .l cget -wraplength
 } -cleanup {
     destroy .l
-} -result {100}
+} -result 100
 test button-1.263 {configuration option: "wraplength" for label} -setup {
     label .l -borderwidth 2 -highlightthickness 2 -font {Helvetica -12 bold}
     pack .l
@@ -2610,7 +2610,7 @@ test button-1.264 {configuration option: "wraplength" for button} -setup {
     .b cget -wraplength
 } -cleanup {
     destroy .b
-} -result {100}
+} -result 100
 test button-1.265 {configuration option: "wraplength" for button} -setup {
     button .b -borderwidth 2 -highlightthickness 2 -font {Helvetica -12 bold}
     pack .b
@@ -2629,7 +2629,7 @@ test button-1.266 {configuration option: "wraplength" for checkbutton} -setup {
     .c cget -wraplength
 } -cleanup {
     destroy .c
-} -result {100}
+} -result 100
 test button-1.267 {configuration option: "wraplength" for checkbutton} -setup {
     checkbutton .c -borderwidth 2 -highlightthickness 2 -font {Helvetica -12 bold}
     pack .c
@@ -2648,7 +2648,7 @@ test button-1.268 {configuration option: "wraplength" for radiobutton} -setup {
     .r cget -wraplength
 } -cleanup {
     destroy .r
-} -result {100}
+} -result 100
 test button-1.269 {configuration option: "wraplength" for radiobutton} -setup {
     radiobutton .r -borderwidth 2 -highlightthickness 2 -font {Helvetica -12 bold}
     pack .r
@@ -2834,13 +2834,13 @@ test button-3.13 {ButtonWidgetCmd procedure, "configure" option} -body {
     lindex [.b configure -highlightthickness] 4
 } -cleanup {
     destroy .b
-}  -result {3}
+}  -result 3
 test button-3.14 {ButtonWidgetCmd procedure, "configure" option} -body {
     checkbutton .c
     llength [.c configure]
 } -cleanup {
     destroy .c
-} -result {41}
+} -result 41
 test button-3.15 {ButtonWidgetCmd procedure, "configure" option} -body {
     button .b
     .b configure -gorp
@@ -2889,7 +2889,7 @@ test button-3.21 {ButtonWidgetCmd procedure, "deselect" option} -body {
     return $checkvar
 } -cleanup {
     destroy .c
-} -result {0}
+} -result 0
 test button-3.22 {ButtonWidgetCmd procedure, "deselect" option} -body {
     radiobutton .r -variable radiovar -value red
     set radiovar green
@@ -3249,7 +3249,7 @@ test button-5.4 {ConfigureButton - variable trace} -body {  ;# ex 6.2a
     return $y
 } -cleanup {
     destroy .c
-} -result {1}
+} -result 1
 
 test button-5.5 {ConfigureButton - image handling} -constraints {
     testImageType
@@ -3282,7 +3282,7 @@ test button-5.7 {ConfigureButton - setting selected state from variable} -body {
     return $y
 } -cleanup {
     destroy .c
-} -result {0}
+} -result 0
 test button-5.8 {ConfigureButton - setting selected state from variable} -setup {
     unset -nocomplain x
 } -body {
@@ -3487,7 +3487,7 @@ test button-5.25 {ConfigureButton - computing geometry} -setup {
     expr {$old == $new}
 } -cleanup {
     destroy .b
-} -result {0}
+} -result 0
 
 test button-6.1 {ButtonEventProc procedure} -body {
     button .b -text "Test Button" -command {
@@ -3554,7 +3554,7 @@ test button-8.3 {TkInvokeButton procedure} -setup {
 } -cleanup {
     destroy .c
     trace vdelete x w bogusTrace
-} -result {1}
+} -result 1
 test button-8.4 {TkInvokeButton procedure} -setup {
     set x 1
 } -body {
@@ -3575,7 +3575,7 @@ test button-8.5 {TkInvokeButton procedure} -setup {
 } -cleanup {
     destroy .c
     trace vdelete x w bogusTrace
-} -result {0}
+} -result 0
 
 test button-8.6 {TkInvokeButton procedure} -setup {
     set x 0
@@ -3665,7 +3665,7 @@ test button-9.2 {ButtonVarProc procedure} -body {
     return $x
 } -cleanup {
     destroy .c
-} -result {1}
+} -result 1
 test button-9.3 {ButtonVarProc procedure} -setup {
     set x 1
 } -body {
@@ -3675,7 +3675,7 @@ test button-9.3 {ButtonVarProc procedure} -setup {
     return $x
 } -cleanup {
     destroy .c
-} -result {1}
+} -result 1
 test button-9.4 {ButtonVarProc procedure} -setup {
     set x 0
 } -body {
@@ -3685,7 +3685,7 @@ test button-9.4 {ButtonVarProc procedure} -setup {
     return $x
 } -cleanup {
     destroy .c
-} -result {0}
+} -result 0
 test button-9.5 {ButtonVarProc procedure} -setup {
     set x 1
 } -body {
@@ -3695,7 +3695,7 @@ test button-9.5 {ButtonVarProc procedure} -setup {
     return $x
 } -cleanup {
     destroy .c
-} -result {0}
+} -result 0
 test button-9.6 {ButtonVarProc procedure} -setup {
     set x 0
 } -body {
@@ -3705,7 +3705,7 @@ test button-9.6 {ButtonVarProc procedure} -setup {
     return $x
 } -cleanup {
     destroy .c
-} -result {1}
+} -result 1
 test button-9.7 {ButtonVarProc procedure} -setup {
     set x 1
 } -body {
@@ -3715,7 +3715,7 @@ test button-9.7 {ButtonVarProc procedure} -setup {
     return $x
 } -cleanup {
     destroy .c
-} -result {1}
+} -result 1
 test button-9.8 {ButtonVarProc procedure, can't read variable} -setup {
 # This test does nothing but produce a core dump if there's a prbblem.
     unset -nocomplain a
@@ -3751,7 +3751,7 @@ test button-10.2 {ButtonTextVarProc procedure} -setup {
     expr {$old == $new}
 } -cleanup {
     destroy .b
-} -result {0}
+} -result 0
 
 test button-11.1 {ButtonImageProc procedure} -constraints {
     testImageType
@@ -3780,7 +3780,7 @@ test button-12.1 {button widget vs hidden commands} -body {
     expr {$res1 == $res2}
 } -cleanup {
     destroy .b
-} -result {1}
+} -result 1
 
 test button-13.1 {size behavior: label} -setup {
     label .a -borderwidth 2 -highlightthickness 2 -font {Helvetica -12 bold}
diff --git a/tests/canvPs.test b/tests/canvPs.test
index eb09af9..aa69336 100644
--- a/tests/canvPs.test
+++ b/tests/canvPs.test
@@ -158,7 +158,7 @@ test canvPs-3.1 {test ps generation with an embedded window} -constraints {
     destroy .c
     imageCleanup
     removeFile bar.ps
-} -result {1}
+} -result 1
 test canvPs-3.2 {test ps generation with an embedded window not mapped} -setup {
     set bar [makeFile {} bar.ps]
     file delete $bar
@@ -172,7 +172,7 @@ test canvPs-3.2 {test ps generation with an embedded window not mapped} -setup {
 } -cleanup {
     destroy .c
     removeFile bar.ps
-} -result {1}
+} -result 1
 
 
 test canvPs-4.1 {test ps generation with single-point uncolored poly, bug 734498} -body {
diff --git a/tests/canvText.test b/tests/canvText.test
index 20cbff4..da60ea4 100644
--- a/tests/canvText.test
+++ b/tests/canvText.test
@@ -250,7 +250,7 @@ test canvText-4.6 {ConfigureText procedure: adjust cursor} -setup {
     .c index test insert
 } -cleanup {
 	.c delete test
-} -result {4}
+} -result 4
 
 
 test canvText-5.1 {ConfigureText procedure: adjust cursor} -body {
@@ -573,7 +573,7 @@ test canvText-8.8 {TextInsert procedure: inserting before cursor} -setup {
     .c icursor test 3
     .c insert test 2 "xyz"
     .c index test insert
-} -result {6}
+} -result 6
 test canvText-8.9 {TextInsert procedure: inserting after cursor} -setup {
     .c create text 20 20 -tag test
     focus .c
@@ -583,7 +583,7 @@ test canvText-8.9 {TextInsert procedure: inserting after cursor} -setup {
     .c icursor test 3
     .c insert test 4 "xyz"
     .c index test insert
-} -result {3}
+} -result 3
 
 # Item used in 9.* tests
 .c create text 20 20 -tag test
@@ -673,19 +673,19 @@ test canvText-9.13 {TextInsert procedure: move cursor} -body {
     .c icursor test 6
     .c dchars test 2 4
     .c index test insert
-} -result {3}
+} -result 3
 test canvText-9.14 {TextInsert procedure: keep cursor >= first} -body {
     .c itemconfig test -text "abcdefghijk"
     .c icursor test 6
     .c dchars test 2 10
     .c index test insert
-} -result {2}
+} -result 2
 test canvText-9.15 {TextInsert procedure: cursor doesn't move} -body {
     .c itemconfig test -text "abcdefghijk"
     .c icursor test 5
     .c dchars test 7 9
     .c index test insert
-} -result {5}
+} -result 5
 .c delete test
 
 
@@ -695,7 +695,7 @@ test canvText-10.1 {TextToPoint procedure} -body {
     .c index test @0,0
 } -cleanup {
 	.c delete test
-} -result {0}
+} -result 0
 
 
 test canvText-11.1 {TextToArea procedure} -setup {
@@ -834,7 +834,7 @@ test canvText-15.1 {SetTextCursor procedure} -setup {
     .c index test insert
 } -cleanup {
     .c delete test
-} -result {3}
+} -result 3
 
 test canvText-16.1 {GetSelText procedure} -setup {
     .c create text 0 0 -tag test
diff --git a/tests/canvas.test b/tests/canvas.test
index 5086389..e5e5ac9 100644
--- a/tests/canvas.test
+++ b/tests/canvas.test
@@ -37,14 +37,14 @@ test canvas-1.4 {configuration options: bad value for "bg"} -body {
 test canvas-1.5 {configuration options: good value for "bd"} -body {
     .c configure -bd 4
     .c cget -bd
-} -result {4}
+} -result 4
 test canvas-1.6 {configuration options: bad value for "bd"} -body {
     .c configure -bd badValue
 } -returnCodes error -result {bad screen distance "badValue"}
 test canvas-1.7 {configuration options: good value for "borderwidth"} -body {
     .c configure -borderwidth 1.3
     .c cget -borderwidth
-} -result {1}
+} -result 1
 test canvas-1.8 {configuration options: bad value for "borderwidth"} -body {
     .c configure -borderwidth badValue
 } -returnCodes error -result {bad screen distance "badValue"}
@@ -58,7 +58,7 @@ test canvas-1.10 {configuration options: bad value for "closeenough"} -body {
 test canvas-1.11 {configuration options: good value for "confine"} -body {
     .c configure -confine true
     .c cget -confine
-} -result {1}
+} -result 1
 test canvas-1.12 {configuration options: bad value for "confine"} -body {
     .c configure -confine silly
 } -returnCodes error -result {expected boolean value but got "silly"}
@@ -72,7 +72,7 @@ test canvas-1.14 {configuration options: bad value for "cursor"} -body {
 test canvas-1.15 {configuration options: good value for "height"} -body {
     .c configure -height 2.1
     .c cget -height
-} -result {2}
+} -result 2
 test canvas-1.16 {configuration options: bad value for "height"} -body {
     .c configure -height x42
 } -returnCodes error -result {bad screen distance "x42"}
@@ -93,7 +93,7 @@ test canvas-1.20 {configuration options: bad value for "highlightcolor"} -body {
 test canvas-1.21 {configuration options: good value for "highlightthickness"} -body {
     .c configure -highlightthickness 18
     .c cget -highlightthickness
-} -result {18}
+} -result 18
 test canvas-1.22 {configuration options: bad value for "highlightthickness"} -body {
     .c configure -highlightthickness badValue
 } -returnCodes error -result {bad screen distance "badValue"}
@@ -107,28 +107,28 @@ test canvas-1.24 {configuration options: bad value for "insertbackground"} -body
 test canvas-1.25 {configuration options: good value for "insertborderwidth"} -body {
     .c configure -insertborderwidth 1.3
     .c cget -insertborderwidth
-} -result {1}
+} -result 1
 test canvas-1.26 {configuration options: bad value for "insertborderwidth"} -body {
     .c configure -insertborderwidth 2.6x
 } -returnCodes error -result {bad screen distance "2.6x"}
 test canvas-1.27 {configuration options: good value for "insertofftime"} -body {
     .c configure -insertofftime 100
     .c cget -insertofftime
-} -result {100}
+} -result 100
 test canvas-1.28 {configuration options: bad value for "insertofftime"} -body {
     .c configure -insertofftime 3.2
 } -returnCodes error -result {expected integer but got "3.2"}
 test canvas-1.29 {configuration options: good value for "insertontime"} -body {
     .c configure -insertontime 100
     .c cget -insertontime
-} -result {100}
+} -result 100
 test canvas-1.30 {configuration options: bad value for "insertontime"} -body {
     .c configure -insertontime 3.2
 } -returnCodes error -result {expected integer but got "3.2"}
 test canvas-1.31 {configuration options: good value for "insertwidth"} -body {
     .c configure -insertwidth 1.3
     .c cget -insertwidth
-} -result {1}
+} -result 1
 test canvas-1.32 {configuration options: bad value for "insertwidth"} -body {
     .c configure -insertwidth 6x
 } -returnCodes error -result {bad screen distance "6x"}
@@ -149,7 +149,7 @@ test canvas-1.36 {configuration options: bad value for "selectbackground"} -body
 test canvas-1.37 {configuration options: good value for "selectborderwidth"} -body {
     .c configure -selectborderwidth 1.3
     .c cget -selectborderwidth
-} -result {1}
+} -result 1
 test canvas-1.38 {configuration options: bad value for "selectborderwidth"} -body {
     .c configure -selectborderwidth badValue
 } -returnCodes error -result {bad screen distance "badValue"}
@@ -167,7 +167,7 @@ test canvas-1.41 {configuration options: good value for "takefocus"} -body {
 test canvas-1.42 {configuration options: good value for "width"} -body {
     .c configure -width 402
     .c cget -width
-} -result {402}
+} -result 402
 test canvas-1.43 {configuration options: bad value for "width"} -body {
     .c configure -width xyz
 } -returnCodes error -result {bad screen distance "xyz"}
@@ -741,7 +741,7 @@ test canvas-15.19 "basic coords check: centimeters are larger than pixels" -setu
 } -body {
     set id [.c create rect 0 0 1cm 1cm]
     expr {[lindex [.c coords $id] 2]>1}
-} -result {1}
+} -result 1
 destroy .c
 
 test canvas-16.1 {arc coords check} -setup {
diff --git a/tests/config.test b/tests/config.test
index 9fd048a..9f1c7e3 100644
--- a/tests/config.test
+++ b/tests/config.test
@@ -235,7 +235,7 @@ test config-4.2 {DoObjConfig - boolean} -constraints testobjconfig -setup {
     .foo cget -boolean
 } -cleanup {
     killTables
-} -returnCodes ok -result {0}
+} -returnCodes ok -result 0
 test config-4.3 {DoObjConfig - boolean} -constraints testobjconfig -setup {
     catch {rename .foo {}}
 } -body {
@@ -259,7 +259,7 @@ test config-4.5 {DoObjConfig - boolean} -constraints testobjconfig -setup {
     .foo cget -boolean
 } -cleanup {
     killTables
-} -returnCodes ok -result {1}
+} -returnCodes ok -result 1
 test config-4.6 {DoObjConfig - boolean} -constraints testobjconfig -setup {
     catch {rename .foo {}}
 } -body {
@@ -287,7 +287,7 @@ test config-4.8 {DoObjConfig - boolean internal value} -constraints {
     .foo cget -boolean
 } -cleanup {
     killTables
-} -result {0}
+} -result 0
 
 test config-4.9 {DoObjConfig - integer} -constraints testobjconfig -setup {
     catch {rename .foo {}}
@@ -303,7 +303,7 @@ test config-4.10 {DoObjConfig - integer} -constraints testobjconfig -setup {
     .foo cget -integer
 } -cleanup {
     killTables
-} -returnCodes ok -result {3}
+} -returnCodes ok -result 3
 test config-4.11 {DoObjConfig - integer} -constraints testobjconfig -setup {
     catch {rename .foo {}}
 } -body {
@@ -333,7 +333,7 @@ test config-4.13 {DoObjConfig - integer internal value} -constraints {
     .foo cget -integer
 } -cleanup {
     killTables
-} -result {421}
+} -result 421
 
 test config-4.14 {DoObjConfig - double} -constraints testobjconfig -setup {
     catch {rename .foo {}}
@@ -472,7 +472,7 @@ test config-4.30 {DoObjConfig - new string table} -constraints {
     .foo configure -stringtable three
 } -cleanup {
     killTables
-} -returnCodes ok -result {16}
+} -returnCodes ok -result 16
 test config-4.31 {DoObjConfig - new string table} -constraints {
     testobjconfig
 } -body {
@@ -564,7 +564,7 @@ test config-4.42 {DoObjConfig - getting rid of old color} -constraints {
     .foo configure -color #444444
 } -cleanup {
     killTables
-} -returnCodes ok -result {32}
+} -returnCodes ok -result 32
 test config-4.43 {DoObjConfig - getting rid of old color} -constraints {
     testobjconfig
 } -body {
@@ -607,7 +607,7 @@ test config-4.47 {DoObjConfig - new font} -constraints testobjconfig -setup {
     .foo configure -font {Helvetica 72}
 } -cleanup {
     killTables
-} -returnCodes ok -result {64}
+} -returnCodes ok -result 64
 test config-4.48 {DoObjConfig - new font} -constraints testobjconfig -setup {
     catch {rename .foo {}}
 } -body {
@@ -668,7 +668,7 @@ test config-4.55 {DoObjConfig - new bitmap} -constraints testobjconfig -body {
     .foo configure -bitmap gray50
 } -cleanup {
     killTables
-} -returnCodes ok -result {128}
+} -returnCodes ok -result 128
 test config-4.56 {DoObjConfig - new bitmap} -constraints testobjconfig -body {
     testobjconfig alltypes .foo -bitmap gray75
     .foo configure -bitmap gray50
@@ -751,7 +751,7 @@ test config-4.67 {DoObjConfig - getting rid of old border} -constraints {
     .foo configure -border #444444
 } -cleanup {
     killTables
-} -returnCodes ok -result {256}
+} -returnCodes ok -result 256
 test config-4.68 {DoObjConfig - getting rid of old border} -constraints {
     testobjconfig
 } -body {
@@ -793,7 +793,7 @@ test config-4.73 {DoObjConfig - new relief} -constraints testobjconfig -body {
     .foo configure -relief flat
 } -cleanup {
     killTables
-} -returnCodes ok -result {512}
+} -returnCodes ok -result 512
 test config-4.74 {DoObjConfig - new relief} -constraints testobjconfig -body {
     testobjconfig alltypes .foo -relief raised
     .foo configure -relief flat
@@ -838,7 +838,7 @@ test config-4.80 {DoObjConfig - new cursor} -constraints testobjconfig -body {
     .foo configure -cursor arrow
 } -cleanup {
     killTables
-} -returnCodes ok -result {1024}
+} -returnCodes ok -result 1024
 test config-4.81 {DoObjConfig - new cursor} -constraints testobjconfig -body {
     testobjconfig alltypes .foo -cursor xterm
     .foo configure -cursor arrow
@@ -878,7 +878,7 @@ test config-4.86 {DoObjConfig - new justify} -constraints testobjconfig -body {
     .foo configure -justify right
 } -cleanup {
     killTables
-} -returnCodes ok -result {2048}
+} -returnCodes ok -result 2048
 test config-4.87 {DoObjConfig - new justify} -constraints testobjconfig -body {
     testobjconfig alltypes .foo -justify left
     .foo configure -justify right
@@ -918,7 +918,7 @@ test config-4.92 {DoObjConfig - new anchor} -constraints testobjconfig -body {
     .foo configure -anchor n
 } -cleanup {
     killTables
-} -returnCodes ok -result {4096}
+} -returnCodes ok -result 4096
 test config-4.93 {DoObjConfig - new anchor} -constraints testobjconfig -body {
     testobjconfig alltypes .foo -anchor e
     .foo configure -anchor n
@@ -946,7 +946,7 @@ test config-4.96 {DoObjConfig - pixel} -constraints testobjconfig -body {
     .foo cget -pixel
 } -cleanup {
     killTables
-} -returnCodes ok -result {42}
+} -returnCodes ok -result 42
 test config-4.97 {DoObjConfig - invalid pixel} -constraints testobjconfig -body {
     testobjconfig alltypes .foo -pixel foo
 } -cleanup {
@@ -957,7 +957,7 @@ test config-4.98 {DoObjConfig - new pixel} -constraints testobjconfig -body {
     .foo configure -pixel 3c
 } -cleanup {
     killTables
-} -returnCodes ok -result {8192}
+} -returnCodes ok -result 8192
 test config-4.99 {DoObjConfig - new pixel} -constraints testobjconfig -body {
     testobjconfig alltypes .foo -pixel 42m
     .foo configure -pixel 3c
@@ -976,7 +976,7 @@ test config-4.100 {DoObjConfig - pixel internal value} -constraints {
     expr {$screenW eq $result}
 } -cleanup {
     killTables
-} -result {1}
+} -result 1
 
 test config-4.101 {DoObjConfig - window} -constraints testobjconfig -body {
     toplevel .bar
@@ -1017,7 +1017,7 @@ test config-4.106 {DoObjConfig - new window} -constraints testobjconfig -body {
     .foo configure -window .blamph
 } -cleanup {
     killTables
-} -returnCodes ok -result {0}
+} -returnCodes ok -result 0
 test config-4.107 {DoObjConfig - new window} -constraints testobjconfig -body {
     toplevel .bar
     toplevel .blamph
@@ -1258,7 +1258,7 @@ test config-7.11 {Tk_SetOptions - synonym name in error message} -constraints {
 ".a configure -synonym bogus"}
 test config-7.12 {Tk_SetOptions - returning mask} -constraints testobjconfig -body {
     format %x [.a configure -color red -int 7 -relief raised -double 3.14159]
-} -result {226}
+} -result 226
 test config-7.13 {Tk_SetOptions - error in DoObjConfig with custom option} -constraints {
     testobjconfig
 } -body {
@@ -1304,7 +1304,7 @@ test config-8.3 {Tk_RestoreSavedOptions - freeing object memory} -constraints {
     .a csave -color green -color black -color blue -color #ffff00 -color #ff00ff
 } -cleanup {
     killTables
-} -result {32}
+} -result 32
 test config-8.4 {Tk_RestoreSavedOptions - boolean internal form} -constraints {
     testobjconfig
 } -body {
@@ -1321,7 +1321,7 @@ test config-8.5 {Tk_RestoreSavedOptions - boolean internal form} -constraints {
     .a cget -boolean
 } -cleanup {
     killTables
-} -result {1}
+} -result 1
 test config-8.6 {Tk_RestoreSavedOptions - integer internal form} -constraints {
     testobjconfig
 } -body {
@@ -1338,7 +1338,7 @@ test config-8.7 {Tk_RestoreSavedOptions - integer internal form} -constraints {
     .a cget -integer
 } -cleanup {
     killTables
-} -result {148962237}
+} -result 148962237
 test config-8.8 {Tk_RestoreSavedOptions - double internal form} -constraints {
     testobjconfig
 } -body {
@@ -1620,11 +1620,11 @@ if {[testConstraint testobjconfig]} {
 test config-12.1 {GetObjectForOption - boolean} -constraints testobjconfig -body {
     .a configure -boolean 0
     .a cget -boolean
-} -result {0}
+} -result 0
 test config-12.2 {GetObjectForOption - integer} -constraints testobjconfig -body {
     .a configure -integer 1247
     .a cget -integer
-} -result {1247}
+} -result 1247
 test config-12.3 {GetObjectForOption - double} -constraints testobjconfig -body {
     .a configure -double -88.82
     .a cget -double
@@ -1680,7 +1680,7 @@ test config-12.13 {GetObjectForOption - anchor} -constraints testobjconfig -body
 test config-12.14 {GetObjectForOption - pixels} -constraints testobjconfig -body {
     .a configure -pixel 193.2
     .a cget -pixel
-} -result {193}
+} -result 193
 test config-12.15 {GetObjectForOption - window} -constraints testobjconfig -body {
     .a configure -window .a
     .a cget -window
diff --git a/tests/dialog.test b/tests/dialog.test
index 2d88103..3ca5146 100644
--- a/tests/dialog.test
+++ b/tests/dialog.test
@@ -36,7 +36,7 @@ test dialog-2.1 {tk_dialog operation} -setup {
     return $res
 } -cleanup {
     destroy .d
-} -result {0}
+} -result 0
 test dialog-2.2 {tk_dialog operation} -setup {
     proc HitReturn {w} {
         event generate $w <Enter>
@@ -51,7 +51,7 @@ test dialog-2.2 {tk_dialog operation} -setup {
     return $res
 } -cleanup {
     destroy .d
-} -result {1}
+} -result 1
 test dialog-2.3 {tk_dialog operation} -body {
     set x [after 5000 [list set tk::Priv(button) "no response"]]
     after 100 destroy .d
diff --git a/tests/entry.test b/tests/entry.test
index b92c894..5b6bfac 100644
--- a/tests/entry.test
+++ b/tests/entry.test
@@ -69,7 +69,7 @@ test entry-1.3 {configuration option: "bd" for entry} -setup {
     .e cget -bd
 } -cleanup {
     destroy .e
-} -result {4}
+} -result 4
 test entry-1.4 {configuration option: "bd" for entry} -setup {
     entry .e -borderwidth 2 -highlightthickness 2 -font {Helvetica -12 bold}
     pack .e
@@ -109,7 +109,7 @@ test entry-1.7 {configuration option: "borderwidth" for entry} -setup {
     .e cget -borderwidth
 } -cleanup {
     destroy .e
-} -result {1}
+} -result 1
 test entry-1.8 {configuration option: "borderwidth" for entry} -setup {
     entry .e -borderwidth 2 -highlightthickness 2 -font {Helvetica -12 bold}
     pack .e
@@ -189,7 +189,7 @@ test entry-1.15 {configuration option: "exportselection" for entry} -setup {
     .e cget -exportselection
 } -cleanup {
     destroy .e
-} -result {1}
+} -result 1
 test entry-1.16 {configuration option: "exportselection" for entry} -setup {
     entry .e -borderwidth 2 -highlightthickness 2 -font {Helvetica -12 bold}
     pack .e
@@ -309,7 +309,7 @@ test entry-1.27 {configuration option: "highlightthickness" for entry} -setup {
     .e cget -highlightthickness
 } -cleanup {
     destroy .e
-} -result {6}
+} -result 6
 test entry-1.28 {configuration option: "highlightthickness" for entry} -setup {
     entry .e -borderwidth 2 -font {Helvetica -12 bold}
     pack .e
@@ -319,7 +319,7 @@ test entry-1.28 {configuration option: "highlightthickness" for entry} -setup {
     .e cget -highlightthickness
 } -cleanup {
     destroy .e
-} -result {0}
+} -result 0
 test entry-1.29 {configuration option: "highlightthickness" for entry} -setup {
     entry .e -borderwidth 2 -highlightthickness 2 -font {Helvetica -12 bold}
     pack .e
@@ -359,7 +359,7 @@ test entry-1.32 {configuration option: "insertborderwidth" for entry} -setup {
     .e cget -insertborderwidth
 } -cleanup {
     destroy .e
-} -result {1}
+} -result 1
 test entry-1.33 {configuration option: "insertborderwidth" for entry} -setup {
     entry .e -borderwidth 2 -highlightthickness 2 -font {Helvetica -12 bold}
     pack .e
@@ -379,7 +379,7 @@ test entry-1.34 {configuration option: "insertofftime" for entry} -setup {
     .e cget -insertofftime
 } -cleanup {
     destroy .e
-} -result {100}
+} -result 100
 test entry-1.35 {configuration option: "insertofftime" for entry} -setup {
     entry .e -borderwidth 2 -highlightthickness 2 -font {Helvetica -12 bold}
     pack .e
@@ -399,7 +399,7 @@ test entry-1.36 {configuration option: "insertontime" for entry} -setup {
     .e cget -insertontime
 } -cleanup {
     destroy .e
-} -result {100}
+} -result 100
 test entry-1.37 {configuration option: "insertontime" for entry} -setup {
     entry .e -borderwidth 2 -highlightthickness 2 -font {Helvetica -12 bold}
     pack .e
@@ -512,7 +512,7 @@ test entry-1.47 {configuration option: "selectborderwidth" for entry} -setup {
     .e cget -selectborderwidth
 } -cleanup {
     destroy .e
-} -result {1}
+} -result 1
 test entry-1.48 {configuration option: "selectborderwidth" for entry} -setup {
     entry .e -borderwidth 2 -highlightthickness 2 -font {Helvetica -12 bold}
     pack .e
@@ -605,7 +605,7 @@ test entry-1.56 {configuration option: "width" for entry} -setup {
     .e cget -width
 } -cleanup {
     destroy .e
-} -result {402}
+} -result 402
 test entry-1.57 {configuration option: "width" for entry} -setup {
     entry .e -borderwidth 2 -highlightthickness 2 -font {Helvetica -12 bold}
     pack .e
@@ -816,7 +816,7 @@ test entry-3.14 {EntryWidgetCmd procedure, "cget" widget command} -setup {
     .e cget -bd
 } -cleanup {
     destroy .e
-} -result {4}
+} -result 4
 test entry-3.15 {EntryWidgetCmd procedure, "configure" widget command} -setup {
     entry .e
     pack .e
@@ -825,7 +825,7 @@ test entry-3.15 {EntryWidgetCmd procedure, "configure" widget command} -setup {
     llength [.e configure]
 } -cleanup {
     destroy .e
-} -result {38}
+} -result 38
 test entry-3.16 {EntryWidgetCmd procedure, "configure" widget command} -setup {
     entry .e
 } -body {
@@ -841,7 +841,7 @@ test entry-3.17 {EntryWidgetCmd procedure, "configure" widget command} -setup {
     lindex [.e configure -bd] 4
 } -cleanup {
     destroy .e
-} -result {4}
+} -result 4
 test entry-3.18 {EntryWidgetCmd procedure, "delete" widget command} -setup {
     entry .e
 } -body {
@@ -880,7 +880,7 @@ test entry-3.22 {EntryWidgetCmd procedure, "delete" widget command} -setup {
     .e get
 } -cleanup {
     destroy .e
-} -result {014567890}
+} -result 014567890
 test entry-3.23 {EntryWidgetCmd procedure, "delete" widget command} -setup {
     entry .e
 } -body {
@@ -889,7 +889,7 @@ test entry-3.23 {EntryWidgetCmd procedure, "delete" widget command} -setup {
     .e get
 } -cleanup {
     destroy .e
-} -result {0123457890}
+} -result 0123457890
 test entry-3.24 {EntryWidgetCmd procedure, "delete" widget command} -setup {
     entry .e
     pack .e
@@ -921,7 +921,7 @@ test entry-3.25 {EntryWidgetCmd procedure, "delete" widget command} -setup {
     .e get
 } -cleanup {
     destroy .e
-} -result {01234567890}
+} -result 01234567890
 test entry-3.26 {EntryWidgetCmd procedure, "delete" widget command} -setup {
     entry .e
     pack .e
@@ -934,7 +934,7 @@ test entry-3.26 {EntryWidgetCmd procedure, "delete" widget command} -setup {
     .e get
 } -cleanup {
     destroy .e
-} -result {01234567890}
+} -result 01234567890
 test entry-3.26a {EntryWidgetCmd procedure, "delete" widget command} -setup {
     entry .e
     pack .e
@@ -947,7 +947,7 @@ test entry-3.26a {EntryWidgetCmd procedure, "delete" widget command} -setup {
     .e get
 } -cleanup {
     destroy .e
-} -result {01234567890}
+} -result 01234567890
 test entry-3.27 {EntryWidgetCmd procedure, "get" widget command} -setup {
     entry .e
 } -body {
@@ -977,7 +977,7 @@ test entry-3.30 {EntryWidgetCmd procedure, "icursor" widget command} -setup {
     .e index insert
 } -cleanup {
     destroy .e
-} -result {4}
+} -result 4
 test entry-3.31 {EntryWidgetCmd procedure, "index" widget command} -setup {
     entry .e
 } -body {
@@ -1063,7 +1063,7 @@ test entry-3.40 {EntryWidgetCmd procedure, "insert" widget command} -setup {
     .e get
 } -cleanup {
     destroy .e
-} -result {01234567890}
+} -result 01234567890
 test entry-3.40a {EntryWidgetCmd procedure, "insert" widget command} -setup {
     entry .e
     pack .e
@@ -1076,7 +1076,7 @@ test entry-3.40a {EntryWidgetCmd procedure, "insert" widget command} -setup {
     .e get
 } -cleanup {
     destroy .e
-} -result {01234567890}
+} -result 01234567890
 test entry-3.41 {EntryWidgetCmd procedure, "insert" widget command} -setup {
     entry .e
 } -body {
@@ -1136,7 +1136,7 @@ test entry-3.46 {EntryWidgetCmd procedure, "scan" widget command} -constraints {
     .e index @0
 } -cleanup {
     destroy .e
-} -result {2}
+} -result 2
 test entry-3.47 {EntryWidgetCmd procedure, "select" widget command} -setup {
     entry .e
 } -body {
@@ -1205,7 +1205,7 @@ test entry-3.52 {EntryWidgetCmd procedure, "selection present" widget command} -
     .e selection present
 } -cleanup {
     destroy .e
-} -result {1}
+} -result 1
 test entry-3.53 {EntryWidgetCmd procedure, "selection present" widget command} -setup {
     entry .e
     pack .e
@@ -1218,7 +1218,7 @@ test entry-3.53 {EntryWidgetCmd procedure, "selection present" widget command} -
     .e selection present
 } -cleanup {
     destroy .e
-} -result {1}
+} -result 1
 test entry-3.54 {EntryWidgetCmd procedure, "selection present" widget command} -setup {
     entry .e
     pack .e
@@ -1231,7 +1231,7 @@ test entry-3.54 {EntryWidgetCmd procedure, "selection present" widget command} -
     .e selection present
 } -cleanup {
     destroy .e
-} -result {0}
+} -result 0
 test entry-3.55 {EntryWidgetCmd procedure, "selection adjust" widget command} -setup {
     entry .e
 } -body {
@@ -1259,7 +1259,7 @@ test entry-3.57 {EntryWidgetCmd procedure, "selection adjust" widget command} -s
     selection get
 } -cleanup {
     destroy .e
-} -result {123}
+} -result 123
 test entry-3.58 {EntryWidgetCmd procedure, "selection adjust" widget command} -setup {
     entry .e
     pack .e
@@ -1273,7 +1273,7 @@ test entry-3.58 {EntryWidgetCmd procedure, "selection adjust" widget command} -s
     selection get
 } -cleanup {
     destroy .e
-} -result {234}
+} -result 234
 test entry-3.59 {EntryWidgetCmd procedure, "selection from" widget command} -setup {
     entry .e
 } -body {
@@ -1487,7 +1487,7 @@ test entry-3.75 {EntryWidgetCmd procedure, "xview" widget command} -setup {
     .e index @0
 } -cleanup {
     destroy .e
-} -result {32}
+} -result 32
 test entry-3.76 {EntryWidgetCmd procedure, "xview" widget command} -setup {
     entry .e -font {Courier -12} -borderwidth 2 -highlightthickness 2
     pack .e
@@ -1501,7 +1501,7 @@ test entry-3.76 {EntryWidgetCmd procedure, "xview" widget command} -setup {
     .e index @0
 } -cleanup {
     destroy .e
-} -result {29}
+} -result 29
 test entry-3.77 {EntryWidgetCmd procedure, "xview" widget command} -setup {
     entry .e -font {Courier -12} -borderwidth 2 -highlightthickness 2
     pack .e
@@ -1537,7 +1537,7 @@ test entry-3.79 {EntryWidgetCmd procedure, "xview" widget command} -setup {
     .e index @0
 } -cleanup {
     destroy .e
-} -result {0}
+} -result 0
 test entry-3.80 {EntryWidgetCmd procedure, "xview" widget command} -setup {
     entry .e -font {Courier -12} -borderwidth 2 -highlightthickness 2
     pack .e
@@ -1549,7 +1549,7 @@ test entry-3.80 {EntryWidgetCmd procedure, "xview" widget command} -setup {
     .e index @0
 } -cleanup {
     destroy .e
-} -result {73}
+} -result 73
 test entry-3.86 {EntryWidgetCmd procedure, "xview" widget command} -setup {
     entry .e -font {Courier -12} -borderwidth 2 -highlightthickness 2
     pack .e
@@ -1600,7 +1600,7 @@ test entry-5.1 {ConfigureEntry procedure, -textvariable} -body {
     .e get
 } -cleanup {
     destroy .e
-} -result {12345}
+} -result 12345
 test entry-5.2 {ConfigureEntry procedure, -textvariable} -body {
     set x 12345
     entry .e -textvariable x
@@ -1806,7 +1806,7 @@ test entry-6.4 {EntryComputeGeometry procedure} -setup {
     .e index @0
 } -cleanup {
     destroy .e
-} -result {6}
+} -result 6
 test entry-6.5 {EntryComputeGeometry procedure} -setup {
     entry .e -highlightthickness 2
     pack .e
@@ -1818,7 +1818,7 @@ test entry-6.5 {EntryComputeGeometry procedure} -setup {
     .e index @0
 } -cleanup {
     destroy .e
-} -result {6}
+} -result 6
 test entry-6.6 {EntryComputeGeometry procedure} -constraints {
     fonts
 } -setup {
@@ -2026,7 +2026,7 @@ test entry-7.7 {InsertChars procedure} -setup {
     .e index insert
 } -cleanup {
     destroy .e
-} -result {7}
+} -result 7
 test entry-7.8 {InsertChars procedure} -setup {
     entry .e -width 10 -font {Courier -12} -highlightthickness 2 -bd 2
     pack .e
@@ -2037,7 +2037,7 @@ test entry-7.8 {InsertChars procedure} -setup {
     .e index insert
 } -cleanup {
     destroy .e
-} -result {4}
+} -result 4
 test entry-7.9 {InsertChars procedure} -setup {
     entry .e -width 10 -font {Courier -12} -highlightthickness 2 -bd 2
     pack .e
@@ -2049,7 +2049,7 @@ test entry-7.9 {InsertChars procedure} -setup {
     .e index @0
 } -cleanup {
     destroy .e
-} -result {7}
+} -result 7
 test entry-7.10 {InsertChars procedure} -setup {
     entry .e -width 10 -font {Courier -12} -highlightthickness 2 -bd 2
     pack .e
@@ -2061,7 +2061,7 @@ test entry-7.10 {InsertChars procedure} -setup {
     .e index @0
 } -cleanup {
     destroy .e
-} -result {4}
+} -result 4
 
 test entry-7.11 {InsertChars procedure} -constraints {
     fonts
@@ -2075,7 +2075,7 @@ test entry-7.11 {InsertChars procedure} -constraints {
     winfo reqwidth .e
 } -cleanup {
     destroy .e
-} -result {59}
+} -result 59
 
 test entry-8.1 {DeleteChars procedure} -setup {
     unset -nocomplain contents
@@ -2260,7 +2260,7 @@ test entry-8.12 {DeleteChars procedure} -setup {
     .e index insert
 } -cleanup {
     destroy .e
-} -result {1}
+} -result 1
 test entry-8.13 {DeleteChars procedure} -setup {
     entry .e -width 10 -font {Courier -12} -highlightthickness 2 -bd 2
     pack .e
@@ -2273,7 +2273,7 @@ test entry-8.13 {DeleteChars procedure} -setup {
     .e index insert
 } -cleanup {
     destroy .e
-} -result {1}
+} -result 1
 test entry-8.14 {DeleteChars procedure} -setup {
     entry .e -width 10 -font {Courier -12} -highlightthickness 2 -bd 2
     pack .e
@@ -2286,7 +2286,7 @@ test entry-8.14 {DeleteChars procedure} -setup {
     .e index insert
 } -cleanup {
     destroy .e
-} -result {4}
+} -result 4
 test entry-8.15 {DeleteChars procedure} -setup {
     entry .e -width 10 -font {Courier -12} -highlightthickness 2 -bd 2
     pack .e
@@ -2299,7 +2299,7 @@ test entry-8.15 {DeleteChars procedure} -setup {
     .e index @0
 } -cleanup {
     destroy .e
-} -result {1}
+} -result 1
 test entry-8.16 {DeleteChars procedure} -setup {
     entry .e -width 10 -font {Courier -12} -highlightthickness 2 -bd 2
     pack .e
@@ -2312,7 +2312,7 @@ test entry-8.16 {DeleteChars procedure} -setup {
     .e index @0
 } -cleanup {
     destroy .e
-} -result {1}
+} -result 1
 test entry-8.17 {DeleteChars procedure} -setup {
     entry .e -width 10 -font {Courier -12} -highlightthickness 2 -bd 2
     pack .e
@@ -2325,7 +2325,7 @@ test entry-8.17 {DeleteChars procedure} -setup {
     .e index @0
 } -cleanup {
     destroy .e
-} -result {4}
+} -result 4
 test entry-8.18 {DeleteChars procedure} -setup {
     entry .e -width 0 -font {Courier -12} -highlightthickness 2 -bd 2
     pack .e
@@ -2347,7 +2347,7 @@ test entry-8.18 {DeleteChars procedure} -setup {
 } -cleanup {
     destroy .e
     unset XPAD expected
-} -result {1}
+} -result 1
 
 test entry-9.1 {EntryValueChanged procedure} -setup {
     unset -nocomplain x
@@ -2428,7 +2428,7 @@ test entry-10.5 {EntrySetValue procedure, updating display position} -setup {
     .e index @0
 } -cleanup {
     destroy .e
-} -result {0}
+} -result 0
 test entry-10.6 {EntrySetValue procedure, updating display position} -setup {
     unset -nocomplain x
     entry .e -highlightthickness 2 -bd 2
@@ -2444,7 +2444,7 @@ test entry-10.6 {EntrySetValue procedure, updating display position} -setup {
     .e index @0
 } -cleanup {
     destroy .e
-} -result {10}
+} -result 10
 test entry-10.7 {EntrySetValue procedure, updating insertion cursor} -setup {
     unset -nocomplain x
     entry .e -highlightthickness 2 -bd 2
@@ -2459,7 +2459,7 @@ test entry-10.7 {EntrySetValue procedure, updating insertion cursor} -setup {
     .e index insert
 } -cleanup {
     destroy .e
-} -result {3}
+} -result 3
 test entry-10.8 {EntrySetValue procedure, updating insertion cursor} -setup {
     unset -nocomplain x
     entry .e -highlightthickness 2 -bd 2
@@ -2473,7 +2473,7 @@ test entry-10.8 {EntrySetValue procedure, updating insertion cursor} -setup {
     .e index insert
 } -cleanup {
     destroy .e
-} -result {5}
+} -result 5
 
 test entry-11.1 {EntryEventProc procedure} -setup {
     entry .e -highlightthickness 2 -bd 2 -font {Helvetica -12}
@@ -2517,7 +2517,7 @@ test entry-13.1 {GetEntryIndex procedure} -setup {
     .e index end
 } -cleanup {
     destroy .e
-} -result {21}
+} -result 21
 test entry-13.2 {GetEntryIndex procedure} -body {
     entry .e
     .e index abogus
@@ -2536,7 +2536,7 @@ test entry-13.3 {GetEntryIndex procedure} -setup {
     .e index anchor
 } -cleanup {
     destroy .e
-} -result {1}
+} -result 1
 test entry-13.4 {GetEntryIndex procedure} -setup {
     entry .e -font {Courier -12} -width 5 -bd 2 -relief sunken
     pack .e
@@ -2549,7 +2549,7 @@ test entry-13.4 {GetEntryIndex procedure} -setup {
     .e index anchor
 } -cleanup {
     destroy .e
-} -result {4}
+} -result 4
 test entry-13.5 {GetEntryIndex procedure} -setup {
     entry .e -font {Courier -12} -width 5 -bd 2 -relief sunken
     pack .e
@@ -2563,7 +2563,7 @@ test entry-13.5 {GetEntryIndex procedure} -setup {
     .e index anchor
 } -cleanup {
     destroy .e
-} -result {15}
+} -result 15
 test entry-13.6 {GetEntryIndex procedure} -setup {
     entry .e
 } -body {
@@ -2582,7 +2582,7 @@ test entry-13.7 {GetEntryIndex procedure} -setup {
     .e index insert
 } -cleanup {
     destroy .e
-} -result {2}
+} -result 2
 test entry-13.8 {GetEntryIndex procedure} -setup {
     entry .e
 } -body {
@@ -2647,7 +2647,7 @@ test entry-13.11 {GetEntryIndex procedure} -constraints aquaOrWin32 -body {
     .e index sel.first
 } -cleanup {
     destroy .e
-} -result {1}
+} -result 1
 
 test entry-13.12 {GetEntryIndex procedure} -constraints x11 -body {
 # Previous settings:
@@ -2761,7 +2761,7 @@ test entry-13.16 {GetEntryIndex procedure} -constraints fonts -body {
     .e index @4
 } -cleanup {
     destroy .e
-} -result {4}
+} -result 4
 test entry-13.17 {GetEntryIndex procedure} -constraints fonts -body {
     entry .e -width 5 -relief sunken -highlightthickness 2 -bd 2\
         -font {Courier -12}
@@ -2772,7 +2772,7 @@ test entry-13.17 {GetEntryIndex procedure} -constraints fonts -body {
     .e index @11
 } -cleanup {
     destroy .e
-} -result {4}
+} -result 4
 test entry-13.18 {GetEntryIndex procedure} -constraints fonts -body {
     entry .e -width 5 -relief sunken -highlightthickness 2 -bd 2\
         -font {Courier -12}
@@ -2783,7 +2783,7 @@ test entry-13.18 {GetEntryIndex procedure} -constraints fonts -body {
     .e index @12
 } -cleanup {
     destroy .e
-} -result {5}
+} -result 5
 test entry-13.19 {GetEntryIndex procedure} -constraints fonts -body {
     entry .e -width 5 -relief sunken -highlightthickness 2 -bd 2\
         -font {Courier -12}
@@ -2794,7 +2794,7 @@ test entry-13.19 {GetEntryIndex procedure} -constraints fonts -body {
     .e index @[expr {[winfo width .e] - 6}]
 } -cleanup {
     destroy .e
-} -result {8}
+} -result 8
 test entry-13.20 {GetEntryIndex procedure} -constraints fonts -body {
     entry .e -width 5 -relief sunken -highlightthickness 2 -bd 2\
         -font {Courier -12}
@@ -2805,7 +2805,7 @@ test entry-13.20 {GetEntryIndex procedure} -constraints fonts -body {
     .e index @[expr {[winfo width .e] - 5}]
 } -cleanup {
     destroy .e
-} -result {9}
+} -result 9
 test entry-13.21 {GetEntryIndex procedure} -body {
     entry .e -width 5 -relief sunken -highlightthickness 2 -bd 2\
         -font {Courier -12}
@@ -2816,7 +2816,7 @@ test entry-13.21 {GetEntryIndex procedure} -body {
     .e index @1000
 } -cleanup {
     destroy .e
-} -result {9}
+} -result 9
 test entry-13.22 {GetEntryIndex procedure} -setup {
     entry .e
     pack .e
@@ -2836,7 +2836,7 @@ test entry-13.23 {GetEntryIndex procedure} -body {
     .e index -10
 } -cleanup {
     destroy .e
-} -result {0}
+} -result 0
 test entry-13.24 {GetEntryIndex procedure} -body {
     entry .e -width 5 -relief sunken -highlightthickness 2 -bd 2\
         -font {Courier -12}
@@ -2847,7 +2847,7 @@ test entry-13.24 {GetEntryIndex procedure} -body {
     .e index 12
 } -cleanup {
     destroy .e
-} -result {12}
+} -result 12
 test entry-13.25 {GetEntryIndex procedure} -body {
     entry .e -width 5 -relief sunken -highlightthickness 2 -bd 2\
         -font {Courier -12}
@@ -2858,7 +2858,7 @@ test entry-13.25 {GetEntryIndex procedure} -body {
     .e index 49
 } -cleanup {
     destroy .e
-} -result {21}
+} -result 21
 test entry-13.26 {GetEntryIndex procedure} -constraints fonts -body {
     entry .e -highlightthickness 2 -bd 2 -font {Helvetica -12}
     selection clear .e
@@ -2905,7 +2905,7 @@ test entry-14.3 {EntryFetchSelection procedure} -setup {
     string compare [selection get] $x
 } -cleanup {
     destroy .e
-} -result {0}
+} -result 0
 
 test entry-15.1 {EntryLostSelection} -body {
     entry .e
@@ -3025,7 +3025,7 @@ test entry-18.1 {Entry widget vs hiding} -setup {
     set res1 [list [winfo children .] [interp hidden]]
     set res2 [list {} $l]
     expr {$res1 == $res2}
-} -result {1}
+} -result 1
 
 ##
 ## Entry widget VALIDATION tests
@@ -3424,7 +3424,7 @@ test entry-20.1 {widget deletion while active} -body {
     winfo exists .e
 } -cleanup {
     destroy .e
-} -result {0}
+} -result 0
 
 test entry-20.2 {widget deletion while active} -body {
     entry .e -validate all \
@@ -3434,7 +3434,7 @@ test entry-20.2 {widget deletion while active} -body {
     winfo exists .e
 } -cleanup {
     destroy .e
-} -result {0}
+} -result 0
 
 test entry-20.3 {widget deletion while active} -body {
     entry .e -validate all \
@@ -3443,7 +3443,7 @@ test entry-20.3 {widget deletion while active} -body {
     winfo exists .e
 } -cleanup {
     destroy .e
-} -result {0}
+} -result 0
 
 test entry-20.4 {widget deletion while active} -body {
     entry .e -validate all \
@@ -3453,7 +3453,7 @@ test entry-20.4 {widget deletion while active} -body {
     winfo exists .e
 } -cleanup {
     destroy .e
-} -result {0}
+} -result 0
 
 test entry-20.5 {widget deletion while active} -body {
     entry .e -validatecommand { destroy .e ; return 0 }
@@ -3461,7 +3461,7 @@ test entry-20.5 {widget deletion while active} -body {
     winfo exists .e
 } -cleanup {
     destroy .e
-} -result {0}
+} -result 0
 
 test entry-20.6 {widget deletion while active} -body {
     pack [entry .e]
@@ -3471,7 +3471,7 @@ test entry-20.6 {widget deletion while active} -body {
     winfo exists .e
 } -cleanup {
     destroy .e
-} -result {0}
+} -result 0
 
 test entry-20.7 {widget deletion with textvariable active} -body {
 # SF bugs 607390 and 617446
@@ -3483,7 +3483,7 @@ test entry-20.7 {widget deletion with textvariable active} -body {
     winfo exists .e
 } -cleanup {
     destroy .e
-} -result {0}
+} -result 0
 
 
 test entry-21.1 {selection present while disabled, bug 637828} -body {
diff --git a/tests/font.test b/tests/font.test
index 9f279dd..92894d1 100644
--- a/tests/font.test
+++ b/tests/font.test
@@ -121,7 +121,7 @@ test font-4.3 {font command: actual: arguments} -body {
 } -returnCodes error -result {wrong # args: should be "font actual font ?-displayof window? ?option? ?--? ?char?"}
 test font-4.4 {font command: actual: displayof specified, so skip to next} -body {
     catch {font actual xyz -displayof . -size}
-} -result {0}
+} -result 0
 test font-4.5 {font command: actual: displayof specified, so skip to next} -body {
     lindex [font actual xyz -displayof .] 0
 } -result {-family}
@@ -536,7 +536,7 @@ test font-12.2 {UpdateDependantFonts procedure: pings the widgets} -setup {
 } -cleanup {
 	destroy .t.f
     font delete xyz
-} -result {1}
+} -result 1
 
 
 test font-13.1 {CreateNamedFont: new named font} -setup {
@@ -1703,7 +1703,7 @@ update
 test font-28.1 {Tk_PointToChar procedure: above all lines} -body {
     csetup "000"
     .t.c index text @-1,0
-} -result {0}
+} -result 0
 test font-28.2 {Tk_PointToChar procedure: no chars} -body {
     # After fixing the following bug:
     #
@@ -1715,46 +1715,46 @@ test font-28.2 {Tk_PointToChar procedure: no chars} -body {
 
     csetup ""
     .t.c index text @100,100
-} -result {0}
+} -result 0
 test font-28.3 {Tk_PointToChar procedure: loop test} -body {
     csetup "000\n000\n000\n000"
     .t.c index text @10000,0
-} -result {3}
+} -result 3
 test font-28.4 {Tk_PointToChar procedure: intersect line} -body {
     csetup "000\n000\n000"
     .t.c index text @0,$ay
-} -result {4}
+} -result 4
 test font-28.5 {Tk_PointToChar procedure: to the left of all chunks} -body {
     csetup "000\n000\n000"
     .t.c index text @-100,$ay
-} -result {4}
+} -result 4
 test font-28.6 {Tk_PointToChar procedure: past any possible chunk} -body {
     csetup "000\n000\n000"
     .t.c index text @100000,$ay
-} -result {7}
+} -result 7
 test font-28.7 {Tk_PointToChar procedure: which chunk on this line} -body {
     csetup "000\n000\t000\t000\n000"
     .t.c index text @[expr $ax*2],$ay
-} -result {6}
+} -result 6
 test font-28.8 {Tk_PointToChar procedure: which chunk on this line} -body {
     csetup "000\n000\t000\t000\n000"
     .t.c index text @[expr $ax*10],$ay
-} -result {10}
+} -result 10
 test font-28.9 {Tk_PointToChar procedure: in special chunk} -body {
     csetup "000\n000\t000\t000\n000"
     .t.c index text @[expr $ax*6],$ay
-} -result {7}
+} -result 7
 test font-28.10 {Tk_PointToChar procedure: past all chars in chunk} -body {
     csetup "000 0000000"
     .t.c itemconfig text -width [expr $ax*5]
     set x [.t.c index text @[expr $ax*5],0]
     .t.c itemconfig text -width 0
     return $x
-} -result {3}
+} -result 3
 test font-28.11 {Tk_PointToChar procedure: below all chunks} -body {
     csetup "000 0000000"
     .t.c index text @0,1000000
-} -result {11}
+} -result 11
 destroy .t.c
 
 
@@ -1801,7 +1801,7 @@ test font-30.1 {Tk_DistanceToTextLayout procedure: loop once} -body {
     return $x
 } -cleanup {
 	bind all <Enter> {}
-} -result {0}
+} -result 0
 test font-30.2 {Tk_DistanceToTextLayout procedure: loop multiple} -body {
     csetup "000\n000\n000"
 	.t.c bind all <Enter> {lappend x [.t.c index current @%x,%y]}
@@ -1811,7 +1811,7 @@ test font-30.2 {Tk_DistanceToTextLayout procedure: loop multiple} -body {
     return $x
 } -cleanup {
 	bind all <Enter> {}
-} -result {5}
+} -result 5
 test font-30.3 {Tk_DistanceToTextLayout procedure: loop to end} -body {
     csetup "000\n0\n000"
 	.t.c bind all <Enter> {lappend x [.t.c index current @%x,%y]}
@@ -1831,7 +1831,7 @@ test font-30.4 {Tk_DistanceToTextLayout procedure: hit a special char (tab)} -bo
     return $x
 } -cleanup {
 	bind all <Enter> {}
-} -result {3}
+} -result 3
 test font-30.5 {Tk_DistanceToTextLayout procedure: ignore newline} -body {
     csetup "000\n0\n000"
 	.t.c bind all <Enter> {lappend x [.t.c index current @%x,%y]}
@@ -1884,7 +1884,7 @@ test font-30.9 {Tk_DistanceToTextLayout procedure: inside line} -body {
     return $x
 } -cleanup {
 	bind all <Enter> {}
-} -result {0}
+} -result 0
 test font-30.10 {Tk_DistanceToTextLayout procedure: above line} -body {
     csetup "0\n000"
 	.t.c bind all <Enter> {lappend x [.t.c index current @%x,%y]}
@@ -1914,7 +1914,7 @@ test font-30.12 {Tk_DistanceToTextLayout procedure: in line} -body {
     return $x
 } -cleanup {
 	bind all <Enter> {}
-} -result {3}
+} -result 3
 .t.c itemconfig text -justify left
 test font-30.13 {Tk_DistanceToTextLayout procedure: exact hit} -body {
     csetup "000"
@@ -1925,7 +1925,7 @@ test font-30.13 {Tk_DistanceToTextLayout procedure: exact hit} -body {
     return $x
 } -cleanup {
 	bind all <Enter> {}
-} -result {1}
+} -result 1
 destroy .t.c
 
 
@@ -1971,7 +1971,7 @@ test font-31.7 {TkIntersectAngledTextLayout procedure: bug [514ff64dd0]} -body {
     # The text has been rotated 90 degrees around it's upper left corner,
     # so it's enough to check with a small rectangle with small negative y coords.
     .t.c find overlapping 5 -7 7 -5
-} -result {1}
+} -result 1
 destroy .t.c
 
 
@@ -2182,7 +2182,7 @@ test font-37.3 {GetAttributeInfo procedure: size} -setup {
 	font config xyz -size
 } -cleanup {
 	font delete xyz
-} -result {20}
+} -result 20
 test font-37.4 {GetAttributeInfo procedure: weight} -setup {
     catch {font delete xyz}
 	set x {}
@@ -2209,7 +2209,7 @@ test font-37.6 {GetAttributeInfo procedure: underline} -setup {
 	font config xyz -underline
 } -cleanup {
 	font delete xyz
-} -result {1}
+} -result 1
 test font-37.7 {GetAttributeInfo procedure: overstrike} -setup {
     catch {font delete xyz}
 	set x {}
@@ -2218,7 +2218,7 @@ test font-37.7 {GetAttributeInfo procedure: overstrike} -setup {
 	font config xyz -overstrike
 } -cleanup {
 	font delete xyz
-} -result {0}
+} -result 0
 
 
 # In tests below, one field is set to "xyz" so that font name doesn't
@@ -2345,7 +2345,7 @@ test font-44.1 {TkFontGetPixels: size < 0} -setup {
     font actual {times -12} -size
 } -cleanup {
 	tk scaling $oldscale
-} -result {24}
+} -result 24
 test font-44.2 {TkFontGetPoints: size >= 0} -constraints noExceed -setup {
 	set oldscale [tk scaling]
 } -body {
@@ -2353,7 +2353,7 @@ test font-44.2 {TkFontGetPoints: size >= 0} -constraints noExceed -setup {
     font actual {times 12} -size
 } -cleanup {
 	tk scaling $oldscale
-} -result {12}
+} -result 12
 
 
 test font-45.1 {TkFontGetAliasList: no match} -body {
@@ -2370,7 +2370,7 @@ test font-45.3 {TkFontGetAliasList: match} -constraints {noExceed} -body {
         set res [expr {[font actual {{times new roman} 10} -family] eq \
                        [font actual {times 10} -family]} ]
     }
-} -result {1}
+} -result 1
 
 
 test font-46.1 {font actual, with character, no option, no --} -body {
diff --git a/tests/fontchooser.test b/tests/fontchooser.test
index 4dad5da..b16bdcc 100644
--- a/tests/fontchooser.test
+++ b/tests/fontchooser.test
@@ -79,7 +79,7 @@ test fontchooser-1.7 {tk fontchooser: usage} -returnCodes error -body {
 
 test fontchooser-1.8 {tk fontchooser: usage} -returnCodes ok -body {
     tk fontchooser configure -visible
-} -result {0}
+} -result 0
 
 test fontchooser-1.9 {tk fontchooser: usage} -returnCodes error -body {
     tk fontchooser configure -visible 1
@@ -155,7 +155,7 @@ test fontchooser-4.1 {fontchooser -font} -constraints scriptImpl -body {
         Click ok
     }
     expr {$::testfont ne {}}
-} -result {1}
+} -result 1
 
 test fontchooser-4.2 {fontchooser -font} -constraints scriptImpl -body {
     start {
@@ -166,7 +166,7 @@ test fontchooser-4.2 {fontchooser -font} -constraints scriptImpl -body {
         Click ok
     }
     expr {$::testfont ne {}}
-} -result {1}
+} -result 1
 
 test fontchooser-4.3 {fontchooser -font} -constraints scriptImpl -body {
     start {
@@ -177,7 +177,7 @@ test fontchooser-4.3 {fontchooser -font} -constraints scriptImpl -body {
         Click ok
     }
     expr {$::testfont ne {}}
-} -result {1}
+} -result 1
 
 test fontchooser-4.4 {fontchooser -font} -constraints scriptImpl -body {
     start {
diff --git a/tests/frame.test b/tests/frame.test
index bdeb2e9..3dbdef6 100644
--- a/tests/frame.test
+++ b/tests/frame.test
@@ -195,7 +195,7 @@ test frame-1.15 {frame configuration options} -body {
     lindex [.f configure -bd] 4
 } -cleanup {
     .f configure -bd [lindex [.f configure -bd] 3]
-} -result {4}
+} -result 4
 test frame-1.16 {frame configuration options} -body {
     .f configure -bd badValue
 } -returnCodes error -result {bad screen distance "badValue"}
@@ -213,7 +213,7 @@ test frame-1.19 {frame configuration options} -body {
     lindex [.f configure -borderwidth] 4
 } -cleanup {
     .f configure -borderwidth [lindex [.f configure -borderwidth] 3]
-} -result {1}
+} -result 1
 test frame-1.20 {frame configuration options} -body {
     .f configure -borderwidth badValue
 } -returnCodes error -result {bad screen distance "badValue"}
@@ -231,7 +231,7 @@ test frame-1.23 {frame configuration options} -body {
     lindex [.f configure -height] 4
 } -cleanup {
     .f configure -height [lindex [.f configure -height] 3]
-} -result {100}
+} -result 100
 test frame-1.24 {frame configuration options} -body {
     .f configure -height not_a_number
 } -returnCodes error -result {bad screen distance "not_a_number"}
@@ -258,7 +258,7 @@ test frame-1.29 {frame configuration options} -body {
     lindex [.f configure -highlightthickness] 4
 } -cleanup {
     .f configure -highlightthickness [lindex [.f configure -highlightthickness] 3]
-} -result {6}
+} -result 6
 test frame-1.30 {frame configuration options} -body {
     .f configure -highlightthickness badValue
 } -returnCodes error -result {bad screen distance "badValue"}
@@ -267,7 +267,7 @@ test frame-1.31 {frame configuration options} -body {
     lindex [.f configure -padx] 4
 } -cleanup {
     .f configure -padx [lindex [.f configure -padx] 3]
-} -result {3}
+} -result 3
 test frame-1.32 {frame configuration options} -body {
     .f configure -padx badValue
 } -returnCodes error -result {bad screen distance "badValue"}
@@ -276,7 +276,7 @@ test frame-1.33 {frame configuration options} -body {
     lindex [.f configure -pady] 4
 } -cleanup {
     .f configure -pady [lindex [.f configure -pady] 3]
-} -result {4}
+} -result 4
 test frame-1.34 {frame configuration options} -body {
     .f configure -pady badValue
 } -returnCodes error -result {bad screen distance "badValue"}
@@ -300,7 +300,7 @@ test frame-1.38 {frame configuration options} -body {
     lindex [.f configure -width] 4
 } -cleanup {
     .f configure -width [lindex [.f configure -width] 3]
-} -result {32}
+} -result 32
 test frame-1.39 {frame configuration options} -body {
     .f configure -width badValue
 } -returnCodes error -result {bad screen distance "badValue"}
@@ -500,7 +500,7 @@ test frame-2.21 {toplevel configuration options} -body {
 test frame-2.22 {toplevel configuration options} -body {
     .t configure -bd 4
     lindex [.t configure -bd] 4
-} -result {4}
+} -result 4
 test frame-2.23 {toplevel configuration options} -body {
     .t configure -bd badValue
 } -returnCodes error -result {bad screen distance "badValue"}
@@ -514,7 +514,7 @@ test frame-2.25 {toplevel configuration options} -body {
 test frame-2.26 {toplevel configuration options} -body {
     .t configure -borderwidth 1.3
     lindex [.t configure -borderwidth] 4
-} -result {1}
+} -result 1
 test frame-2.27 {toplevel configuration options} -body {
     .t configure -borderwidth badValue
 } -returnCodes error -result {bad screen distance "badValue"}
@@ -528,7 +528,7 @@ test frame-2.29 {toplevel configuration options} -body {
 test frame-2.30 {toplevel configuration options} -body {
     .t configure -height 100
     lindex [.t configure -height] 4
-} -result {100}
+} -result 100
 test frame-2.31 {toplevel configuration options} -body {
     .t configure -height not_a_number
 } -returnCodes error -result {bad screen distance "not_a_number"}
@@ -542,21 +542,21 @@ test frame-2.33 {toplevel configuration options} -body {
 test frame-2.34 {toplevel configuration options} -body {
     .t configure -highlightthickness 3
     lindex [.t configure -highlightthickness] 4
-} -result {3}
+} -result 3
 test frame-2.35 {toplevel configuration options} -body {
     .t configure -highlightthickness badValue
 } -returnCodes error -result {bad screen distance "badValue"}
 test frame-2.36 {toplevel configuration options} -body {
     .t configure -padx 3
     lindex [.t configure -padx] 4
-} -result {3}
+} -result 3
 test frame-2.37 {toplevel configuration options} -body {
     .t configure -padx badValue
 } -returnCodes error -result {bad screen distance "badValue"}
 test frame-2.38 {toplevel configuration options} -body {
     .t configure -pady 4
     lindex [.t configure -pady] 4
-} -result {4}
+} -result 4
 test frame-2.39 {toplevel configuration options} -body {
     .t configure -pady badValue
 } -returnCodes error -result {bad screen distance "badValue"}
@@ -570,7 +570,7 @@ test frame-2.41 {toplevel configuration options} -returnCodes error -body {
 test frame-2.42 {toplevel configuration options} -body {
     .t configure -width 32
     lindex [.t configure -width] 4
-} -result {32}
+} -result 32
 test frame-2.43 {toplevel configuration options} -body {
     .t configure -width badValue
 } -returnCodes error -result {bad screen distance "badValue"}
@@ -707,7 +707,7 @@ test frame-3.11 {TkCreateFrame procedure} -constraints {
     colorsFree .t
 } -cleanup {
     destroy .t
-} -result {0}
+} -result 0
 test frame-3.12 {TkCreateFrame procedure} -constraints {
     defaultPseudocolor8 nonPortable
 } -setup {
@@ -719,7 +719,7 @@ test frame-3.12 {TkCreateFrame procedure} -constraints {
     colorsFree .t
 } -cleanup {
     destroy .t
-} -result {1}
+} -result 1
 test frame-3.13 {TkCreateFrame procedure} -constraints {
     defaultPseudocolor8 nonPortable
 } -setup {
@@ -734,7 +734,7 @@ test frame-3.13 {TkCreateFrame procedure} -constraints {
     colorsFree .t
 } -cleanup {
     destroy .t
-} -result {1}
+} -result 1
 test frame-3.14 {TkCreateFrame procedure} -constraints {
     defaultPseudocolor8 nonPortable
 } -setup {
@@ -749,7 +749,7 @@ test frame-3.14 {TkCreateFrame procedure} -constraints {
     colorsFree .t
 } -cleanup {
     destroy .t
-} -result {1}
+} -result 1
 test frame-3.15 {TkCreateFrame procedure, -use and -colormap} -constraints {
     defaultPseudocolor8 unix nonPortable
 } -setup {
@@ -774,7 +774,7 @@ test frame-3.16 {TkCreateFrame procedure} -constraints {
     colorsFree .t
 } -cleanup {
     destroy .t
-} -result {0}
+} -result 0
 test frame-3.17 {TkCreateFrame procedure} -constraints {
     defaultPseudocolor8 nonPortable
 } -setup {
@@ -787,7 +787,7 @@ test frame-3.17 {TkCreateFrame procedure} -constraints {
     colorsFree .t
 } -cleanup {
     destroy .t
-} -result {1}
+} -result 1
 test frame-3.18 {TkCreateFrame procedure} -constraints {
     defaultPseudocolor8 haveGrayscale8 nonPortable
 } -setup {
@@ -799,7 +799,7 @@ test frame-3.18 {TkCreateFrame procedure} -constraints {
     colorsFree .t 131 131 131
 } -cleanup {
     destroy .t
-} -result {1}
+} -result 1
 test frame-3.19 {TkCreateFrame procedure} -constraints {
     defaultPseudocolor8 haveGrayscale8 nonPortable
 } -setup {
@@ -841,7 +841,7 @@ test frame-3.21 {TkCreateFrame procedure} -constraints {
     colorsFree .t 131 131 131
 } -cleanup {
     destroy .t
-} -result {1}
+} -result 1
 if {[testConstraint defaultPseudocolor8]} {
     destroy .t1
 }
@@ -1041,7 +1041,7 @@ test frame-9.2 {MapFrame procedure} -setup {
     destroy .t
     update
     winfo exists .t
-} -result {0}
+} -result 0
 test frame-9.3 {MapFrame procedure, window deleted while mapping} -setup {
     deleteWindows
 } -body {
@@ -1057,7 +1057,7 @@ test frame-9.3 {MapFrame procedure, window deleted while mapping} -setup {
     winfo exists .t
 } -cleanup {
     deleteWindows
-} -result {0}
+} -result 0
 
 test frame-10.1 {frame widget vs hidden commands} -setup {
     deleteWindows
@@ -1167,7 +1167,7 @@ test frame-12.3 {FrameWorldChanged procedure} -setup {
 } -cleanup {
     deleteWindows
     font delete myfont
-} -result {0}
+} -result 0
 
 test frame-13.1 {labelframe configuration options} -setup {
     deleteWindows
@@ -1252,7 +1252,7 @@ test frame-13.12 {labelframe configuration options} -body {
     lindex [.f configure -bd] 4
 } -cleanup {
     .f configure -bd [lindex [.f configure -bd] 3]
-} -result {4}
+} -result 4
 test frame-13.13 {labelframe configuration options} -body {
     .f configure -bd badValue
 } -returnCodes error -result {bad screen distance "badValue"}
@@ -1270,7 +1270,7 @@ test frame-13.16 {labelframe configuration options} -body {
     lindex [.f configure -borderwidth] 4
 } -cleanup {
     .f configure -borderwidth [lindex [.f configure -borderwidth] 3]
-} -result {1}
+} -result 1
 test frame-13.17 {labelframe configuration options} -body {
     .f configure -borderwidth badValue
 } -returnCodes error -result {bad screen distance "badValue"}
@@ -1312,7 +1312,7 @@ test frame-13.25 {labelframe configuration options} -body {
     lindex [.f configure -height] 4
 } -cleanup {
     .f configure -height [lindex [.f configure -height] 3]
-} -result {100}
+} -result 100
 test frame-13.26 {labelframe configuration options} -body {
     .f configure -height not_a_number
 } -returnCodes error -result {bad screen distance "not_a_number"}
@@ -1339,7 +1339,7 @@ test frame-13.31 {labelframe configuration options} -body {
     lindex [.f configure -highlightthickness] 4
 } -cleanup {
     .f configure -highlightthickness [lindex [.f configure -highlightthickness] 3]
-} -result {6}
+} -result 6
 test frame-13.32 {labelframe configuration options} -body {
     .f configure -highlightthickness badValue
 } -returnCodes error -result {bad screen distance "badValue"}
@@ -1357,7 +1357,7 @@ test frame-13.35 {labelframe configuration options} -body {
     lindex [.f configure -padx] 4
 } -cleanup {
     .f configure -padx [lindex [.f configure -padx] 3]
-} -result {3}
+} -result 3
 test frame-13.36 {labelframe configuration options} -body {
     .f configure -padx badValue
 } -returnCodes error -result {bad screen distance "badValue"}
@@ -1366,7 +1366,7 @@ test frame-13.37 {labelframe configuration options} -body {
     lindex [.f configure -pady] 4
 } -cleanup {
     .f configure -pady [lindex [.f configure -pady] 3]
-} -result {4}
+} -result 4
 test frame-13.38 {labelframe configuration options} -body {
     .f configure -pady badValue
 } -returnCodes error -result {bad screen distance "badValue"}
@@ -1396,7 +1396,7 @@ test frame-13.43 {labelframe configuration options} -body {
     lindex [.f configure -width] 4
 } -cleanup {
     .f configure -width [lindex [.f configure -width] 3]
-} -result {32}
+} -result 32
 test frame-13.44 {labelframe configuration options} -body {
     .f configure -width badValue
 } -returnCodes error -result {bad screen distance "badValue"}
diff --git a/tests/geometry.test b/tests/geometry.test
index c10a119..d3bb0c5 100644
--- a/tests/geometry.test
+++ b/tests/geometry.test
@@ -282,7 +282,7 @@ test geometry-4.10 {Tk_MaintainGeometry and Tk_UnmaintainGeometry} -setup {
     winfo ismapped .t.quit
 } -cleanup {
     destroy .t
-} -result {1}
+} -result 1
 
 
 # cleanup
diff --git a/tests/grid.test b/tests/grid.test
index 53f8be5..c138479 100644
--- a/tests/grid.test
+++ b/tests/grid.test
@@ -389,12 +389,12 @@ test grid-7.2 {propagate} -body {
     grid propagate .
 } -cleanup {
     grid_reset 7.2
-} -result {1}
+} -result 1
 test grid-7.3 {propagate} -body {
     grid propagate . 0;grid propagate .
 } -cleanup {
     grid_reset 7.3
-} -result {0}
+} -result 0
 test grid-7.4 {propagate} -body {
     grid propagate .x
 } -cleanup {
@@ -596,7 +596,7 @@ test grid-10.5 {column/row configure} -body {
     grid columnconfigure . 265 -weight
 } -cleanup {
     grid_reset 10.5
-} -result {0}
+} -result 0
 test grid-10.6 {column/row configure} -body {
     grid columnconfigure . 0
 } -cleanup {
@@ -622,7 +622,7 @@ test grid-10.10 {column/row configure} -body {
     grid columnconfigure . 0 -minsize
 } -cleanup {
     grid_reset 10.10
-} -result {10}
+} -result 10
 test grid-10.11 {column/row configure} -body {
     grid columnconfigure . 0 -weight bad
 } -cleanup {
@@ -638,7 +638,7 @@ test grid-10.13 {column/row configure} -body {
     grid columnconfigure . 0 -weight
 } -cleanup {
     grid_reset 10.13
-} -result {3}
+} -result 3
 test grid-10.14 {column/row configure} -body {
     grid columnconfigure . 0 -pad foo
 } -cleanup {
@@ -654,7 +654,7 @@ test grid-10.16 {column/row configure} -body {
     grid columnconfigure . 0 -pad
 } -cleanup {
     grid_reset 10.16
-} -result {3}
+} -result 3
 test grid-10.17 {column/row configure} -body {
     frame .f
     set a ""
@@ -2055,7 +2055,7 @@ test grid-24.1 {<<NoManagedChild>> fires on last grid forget} -setup {
 } -cleanup {
     bind . <<NoManagedChild>> {}
     grid_reset 24.1
-} -result {1}
+} -result 1
 test grid-24.2 {<<NoManagedChild>> fires on last grid remove} -setup {
     global A
     unset -nocomplain A
@@ -2069,7 +2069,7 @@ test grid-24.2 {<<NoManagedChild>> fires on last grid remove} -setup {
 } -cleanup {
     bind . <<NoManagedChild>> {}
     grid_reset 24.2
-} -result {1}
+} -result 1
 test grid-24.3 {<<NoManagedChild>> fires on last gridded child destruction} -setup {
     global A
     unset -nocomplain A
@@ -2083,7 +2083,7 @@ test grid-24.3 {<<NoManagedChild>> fires on last gridded child destruction} -set
 } -cleanup {
     bind . <<NoManagedChild>> {}
     grid_reset 24.3
-} -result {1}
+} -result 1
 test grid-24.4 {<Configure> does not fire on last grid forget} -setup {
     global A
     unset -nocomplain A
@@ -2097,7 +2097,7 @@ test grid-24.4 {<Configure> does not fire on last grid forget} -setup {
 } -cleanup {
     bind . <Configure> {}
     grid_reset 24.4
-} -result {0}
+} -result 0
 test grid-24.5 {<Configure> fires on forelast grid forget} -setup {
     global A
     unset -nocomplain A
@@ -2112,7 +2112,7 @@ test grid-24.5 {<Configure> fires on forelast grid forget} -setup {
 } -cleanup {
     bind . <Configure> {}
     grid_reset 24.5
-} -result {1}
+} -result 1
 test grid-24.6 {<<NoManagedChild>> does not fire on forelast grid forget} -setup {
     global A
     unset -nocomplain A
@@ -2127,7 +2127,7 @@ test grid-24.6 {<<NoManagedChild>> does not fire on forelast grid forget} -setup
 } -cleanup {
     bind . <<NoManagedChild>> {}
     grid_reset 24.6
-} -result {0}
+} -result 0
 test grid-24.7 {<<NoManagedChild>> does not fire on grid anchor} -setup {
     global A
     unset -nocomplain A
@@ -2140,7 +2140,7 @@ test grid-24.7 {<<NoManagedChild>> does not fire on grid anchor} -setup {
     grid anchor . nw
     bind . <<NoManagedChild>> {}
     grid_reset 24.7
-} -result {0}
+} -result 0
 test grid-24.8 {<<NoManagedChild>> does not fire on last grid forget if propagation is off} -setup {
     global A
     unset -nocomplain A
@@ -2155,7 +2155,7 @@ test grid-24.8 {<<NoManagedChild>> does not fire on last grid forget if propagat
 } -cleanup {
     bind . <<NoManagedChild>> {}
     grid_reset 24.8
-} -result {0}
+} -result 0
 
 # cleanup
 cleanupTests
diff --git a/tests/image.test b/tests/image.test
index ee3f3d9..31b7099 100644
--- a/tests/image.test
+++ b/tests/image.test
@@ -50,7 +50,7 @@ test image-1.6 {Tk_ImageCmd procedure, "create" option} -constraints {
     expr {$second-$first}
 } -cleanup {
     imageCleanup
-} -result {1}
+} -result 1
 
 test image-1.7 {Tk_ImageCmd procedure, "create" option} -constraints {
     testImageType
diff --git a/tests/imgBmap.test b/tests/imgBmap.test
index e7f2c7e..f9fab4d 100644
--- a/tests/imgBmap.test
+++ b/tests/imgBmap.test
@@ -366,7 +366,7 @@ test imageBmap-7.5 {ImgBmapCmd procedure, "cget" option} -body {
 } -returnCodes error -result {unknown option "-stupid"}
 test imageBmap-7.6 {ImgBmapCmd procedure} -body {
     llength [i1 configure]
-} -result {6}
+} -result 6
 test imageBmap-7.7 {ImgBmapCmd procedure} -body {
     i1 co -foreground #001122
     i1 configure -foreground
diff --git a/tests/imgListFormat.test b/tests/imgListFormat.test
index 331b572..be92a07 100644
--- a/tests/imgListFormat.test
+++ b/tests/imgListFormat.test
@@ -187,7 +187,7 @@ test imgListFormat-4.4 {StringReadDef: normal use case} -constraints {
 } -cleanup {
     imageCleanup
     unset imgData
-} -result {1}
+} -result 1
 test imgListFormat-4.5 {StringReadDef: correct compositing rule} -constraints {
     hasTranspTeapotPhoto
 } -setup {
diff --git a/tests/imgPNG.test b/tests/imgPNG.test
index a95ffce..2d38a2d 100644
--- a/tests/imgPNG.test
+++ b/tests/imgPNG.test
@@ -1116,7 +1116,7 @@ test imgPNG-3.1 {reading image with unknown ancillary chunk - bug [1c659ef0f1]}
     catch {set i [image create photo -file $fileName]}
 } -cleanup {
     image delete $i
-} -result {0}
+} -result 0
 
 test imgPNG-4.1 {data image with metadata} -body {
     image create photo i1 -data $encoded(dpi100aspect2)
diff --git a/tests/imgPhoto.test b/tests/imgPhoto.test
index f0cd730..3ecd2b4 100644
--- a/tests/imgPhoto.test
+++ b/tests/imgPhoto.test
@@ -187,7 +187,7 @@ test imgPhoto-1.12 {option -alpha, normal use} -setup {
     photo1 transparency get 0 0 -alpha
 } -cleanup {
     imageCleanup
-} -result {255}
+} -result 255
 test imgPhoto-1.13 {option -withalpha, normal use} -setup {
     image create photo photo1
 } -body {
@@ -1208,7 +1208,7 @@ test imgPhoto-4.100 {ImgPhotoCmd put: no changes on empty data} -setup {
     string equal $imgData [photo1 data]
 } -cleanup {
     imageCleanup
-} -result {1}
+} -result 1
 test imgPhoto-4.101 {ImgPhotoCmd get: too many args} -setup {
     image create photo photo1
 } -body {
@@ -1524,7 +1524,7 @@ test imgPhoto-10.2 {Tk_ImgPhotoPutBlock, same source and dest img} -constraints
     string equal [photo1 data] [photo2 data]
 } -cleanup {
     imageCleanup
-} -result {1}
+} -result 1
 test imgPhoto-10.3 {Tk_ImgPhotoPutBlock, same source and dest img} -constraints {
     hasTeapotPhoto
 } -setup {
@@ -1538,7 +1538,7 @@ test imgPhoto-10.3 {Tk_ImgPhotoPutBlock, same source and dest img} -constraints
     string equal [photo1 data] [photo2 data]
 } -cleanup {
     imageCleanup
-} -result {1}
+} -result 1
 test imgPhoto-10.4 {Tk_ImgPhotoPutBlock, empty image} -setup {
     imageCleanup
 } -body {
@@ -1580,7 +1580,7 @@ test imgPhoto-12.2 {Tk_ImgPhotoPutZoomedBlock, same source and dest img} -constr
     string equal [photo1 data] [photo2 data]
 } -cleanup {
     imageCleanup
-} -result {1}
+} -result 1
 test imgPhoto-12.3 {Tk_ImgPhotoPutZoomedBlock, same source and dest img} -setup {
     imageCleanup
 } -body {
@@ -1592,7 +1592,7 @@ test imgPhoto-12.3 {Tk_ImgPhotoPutZoomedBlock, same source and dest img} -setup
     string equal [photo1 data] [photo2 data]
 } -cleanup {
     imageCleanup
-} -result {1}
+} -result 1
 test imgPhoto-12.4 {Tk_ImgPhotoPutZoomedBlock, empty image} -setup {
     imageCleanup
 } -body {
diff --git a/tests/imgSVGnano.test b/tests/imgSVGnano.test
index ff7046a..44b4e72 100644
--- a/tests/imgSVGnano.test
+++ b/tests/imgSVGnano.test
@@ -158,7 +158,7 @@ test imgSVGnano-3.7 {Option -scaletowidth} -body {
     image width foo
 } -cleanup {
     rename foo ""
-} -result {20}
+} -result 20
 
 test imgSVGnano-3.8 {Option -scaletoheight} -body {
     image create photo foo -format "svg -scaletoheight 20"\
@@ -166,7 +166,7 @@ test imgSVGnano-3.8 {Option -scaletoheight} -body {
     image height foo
 } -cleanup {
     rename foo ""
-} -result {20}
+} -result 20
 
 test imgSVGnano-3.10 {change from -scaletoheight to -scale} -body {
     set res {}
diff --git a/tests/listbox.test b/tests/listbox.test
index 98ec96c..8a54916 100644
--- a/tests/listbox.test
+++ b/tests/listbox.test
@@ -376,15 +376,15 @@ test listbox-3.5 {ListboxWidgetCmd procedure, "activate" option} -body {
 test listbox-3.6 {ListboxWidgetCmd procedure, "activate" option} -body {
     .l activate -1
     .l index active
-} -result {0}
+} -result 0
 test listbox-3.7 {ListboxWidgetCmd procedure, "activate" option} -body {
     .l activate 30
     .l index active
-} -result {17}
+} -result 17
 test listbox-3.8 {ListboxWidgetCmd procedure, "activate" option} -body {
     .l activate end
     .l index active
-} -result {17}
+} -result 17
 test listbox-3.9 {ListboxWidgetCmd procedure, "bbox" option} -body {
     .l bbox
 } -returnCodes error -result {wrong # args: should be ".l bbox index"}
@@ -508,7 +508,7 @@ test listbox-3.18b {ListboxWidgetCmd procedure, "bbox" option, justified, non-de
 } -cleanup {
     destroy .top.l .top
     unset -nocomplain lres res
-} -result {1}
+} -result 1
 test listbox-3.19 {ListboxWidgetCmd procedure, "cget" option} -body {
     .l cget
 } -returnCodes error -result {wrong # args: should be ".l cget option"}
@@ -520,10 +520,10 @@ test listbox-3.21 {ListboxWidgetCmd procedure, "cget" option} -body {
 } -returnCodes error -result {unknown option "-gorp"}
 test listbox-3.22 {ListboxWidgetCmd procedure, "cget" option} -body {
     .l cget -setgrid
-} -result {0}
+} -result 0
 test listbox-3.23 {ListboxWidgetCmd procedure, "configure" option} -body {
     llength [.l configure]
-} -result {28}
+} -result 28
 test listbox-3.24 {ListboxWidgetCmd procedure, "configure" option} -body {
     .l configure -gorp
 } -returnCodes error -result {unknown option "-gorp"}
@@ -783,7 +783,7 @@ test listbox-3.72 {ListboxWidgetCmd procedure, "nearest" option} -body {
 test listbox-3.73 {ListboxWidgetCmd procedure, "nearest" option} -body {
     .l yview 3
     .l nearest 1000
-} -result {7}
+} -result 7
 test listbox-3.74 {ListboxWidgetCmd procedure, "scan" option} -body {
     .l scan a b
 } -returnCodes error -result {wrong # args: should be ".l scan mark|dragto x y"}
@@ -830,52 +830,52 @@ test listbox-3.83 {ListboxWidgetCmd procedure, "see" option} -body {
     .l yview 7
     .l see 7
     .l index @0,0
-} -result {7}
+} -result 7
 test listbox-3.84 {ListboxWidgetCmd procedure, "see" option} -body {
     .l yview 7
     .l see 11
     .l index @0,0
-} -result {7}
+} -result 7
 test listbox-3.85 {ListboxWidgetCmd procedure, "see" option} -body {
     .l yview 7
     .l see 6
     .l index @0,0
-} -result {6}
+} -result 6
 test listbox-3.86 {ListboxWidgetCmd procedure, "see" option} -body {
     .l yview 7
     .l see 5
     .l index @0,0
-} -result {3}
+} -result 3
 test listbox-3.87 {ListboxWidgetCmd procedure, "see" option} -body {
     .l yview 7
     .l see 12
     .l index @0,0
-} -result {8}
+} -result 8
 test listbox-3.88 {ListboxWidgetCmd procedure, "see" option} -body {
     .l yview 7
     .l see 13
     .l index @0,0
-} -result {11}
+} -result 11
 test listbox-3.89 {ListboxWidgetCmd procedure, "see" option} -body {
     .l yview 7
     .l see -1
     .l index @0,0
-} -result {0}
+} -result 0
 test listbox-3.90 {ListboxWidgetCmd procedure, "see" option} -body {
     .l yview 7
     .l see end
     .l index @0,0
-} -result {13}
+} -result 13
 test listbox-3.91 {ListboxWidgetCmd procedure, "see" option} -body {
     .l yview 7
     .l see 322
     .l index @0,0
-} -result {13}
+} -result 13
 test listbox-3.92 {ListboxWidgetCmd procedure, "see" option, partial last line} -body {
     mkPartial
     .partial.l see 4
     .partial.l index @0,0
-} -result {1}
+} -result 1
 test listbox-3.93 {ListboxWidgetCmd procedure, "selection" option} -body {
     .l select a
 } -returnCodes error -result {wrong # args: should be ".l selection option index ?index?"}
@@ -898,15 +898,15 @@ test listbox-3.98 {ListboxWidgetCmd procedure, "selection" option} -body {
 test listbox-3.99 {ListboxWidgetCmd procedure, "selection" option} -body {
     .l selection anchor -1
     .l index anchor
-} -result {0}
+} -result 0
 test listbox-3.100 {ListboxWidgetCmd procedure, "selection" option} -body {
     .l selection anchor end
     .l index anchor
-} -result {17}
+} -result 17
 test listbox-3.101 {ListboxWidgetCmd procedure, "selection" option} -body {
     .l selection anchor 44
     .l index anchor
-} -result {17}
+} -result 17
 test listbox-3.102 {ListboxWidgetCmd procedure, "selection" option} -body {
     .l selection clear 0 end
     .l selection set 2 8
@@ -926,16 +926,16 @@ test listbox-3.104 {ListboxWidgetCmd procedure, "selection" option} -body {
 test listbox-3.105 {ListboxWidgetCmd procedure, "selection" option} -body {
     .l selection set 0 end
     .l selection includes -1
-} -result {0}
+} -result 0
 test listbox-3.106 {ListboxWidgetCmd procedure, "selection" option} -body {
     .l selection clear 0 end
     .l selection set end
     .l selection includes end
-} -result {1}
+} -result 1
 test listbox-3.107 {ListboxWidgetCmd procedure, "selection" option} -body {
     .l selection set 0 end
     .l selection includes 44
-} -result {0}
+} -result 0
 test listbox-3.108 {ListboxWidgetCmd procedure, "selection" option} -setup {
     destroy .l2
 } -body {
@@ -943,7 +943,7 @@ test listbox-3.108 {ListboxWidgetCmd procedure, "selection" option} -setup {
     .l2 selection includes 0
 } -cleanup {
     destroy .l2
-} -result {0}
+} -result 0
 test listbox-3.109 {ListboxWidgetCmd procedure, "selection" option} -body {
     .l selection clear 0 end
     .l selection set 2
@@ -965,7 +965,7 @@ test listbox-3.112 {ListboxWidgetCmd procedure, "size" option} -body {
 } -returnCodes error -result {wrong # args: should be ".l size"}
 test listbox-3.113 {ListboxWidgetCmd procedure, "size" option} -body {
     .l size
-} -result {18}
+} -result 18
 test listbox-3.114 {ListboxWidgetCmd procedure, "xview" option} -setup {
     destroy .l2
 } -body {
@@ -1242,7 +1242,7 @@ test listbox-4.2 {ConfigureListbox procedure} -setup {
     .l cget -highlightthickness
 } -cleanup {
     deleteWindows
-} -result {0}
+} -result 0
 test listbox-4.3 {ConfigureListbox procedure} -setup {
     deleteWindows
     destroy .l
@@ -1573,14 +1573,14 @@ test listbox-6.2 {InsertEls procedure} -body {
     .l selection anchor 2
     .l insert 2 A B
     .l index anchor
-} -result {4}
+} -result 4
 test listbox-6.3 {InsertEls procedure} -body {
     .l delete 0 end
     .l insert 0 a b c d e f g h i j
     .l selection anchor 2
     .l insert 3 A B
     .l index anchor
-} -result {2}
+} -result 2
 test listbox-6.4 {InsertEls procedure} -body {
     .l delete 0 end
     .l insert 0 a b c d e f g h i j
@@ -1588,7 +1588,7 @@ test listbox-6.4 {InsertEls procedure} -body {
     update
     .l insert 2 A B
     .l index @0,0
-} -result {5}
+} -result 5
 test listbox-6.5 {InsertEls procedure} -body {
     .l delete 0 end
     .l insert 0 a b c d e f g h i j
@@ -1596,31 +1596,31 @@ test listbox-6.5 {InsertEls procedure} -body {
     update
     .l insert 3 A B
     .l index @0,0
-} -result {3}
+} -result 3
 test listbox-6.6 {InsertEls procedure} -body {
     .l delete 0 end
     .l insert 0 a b c d e f g h i j
     .l activate 5
     .l insert 5 A B
     .l index active
-} -result {7}
+} -result 7
 test listbox-6.7 {InsertEls procedure} -body {
     .l delete 0 end
     .l insert 0 a b c d e f g h i j
     .l activate 5
     .l insert 6 A B
     .l index active
-} -result {5}
+} -result 5
 test listbox-6.8 {InsertEls procedure} -body {
     .l delete 0 end
     .l insert 0 a b c
     .l index active
-} -result {2}
+} -result 2
 test listbox-6.9 {InsertEls procedure} -body {
     .l delete 0 end
     .l insert 0
     .l index active
-} -result {0}
+} -result 0
 test listbox-6.10 {InsertEls procedure} -body {
     .l delete 0 end
     .l insert 0 a b "two words"  c d e f g h i j
@@ -1728,28 +1728,28 @@ test listbox-7.5 {DeleteEls procedure} -body {
     .l selection anchor 2
     .l delete 0 1
     .l index anchor
-} -result {0}
+} -result 0
 test listbox-7.6 {DeleteEls procedure} -body {
     .l delete 0 end
     .l insert 0 a b c d e f g h i j
     .l selection anchor 2
     .l delete 2
     .l index anchor
-} -result {2}
+} -result 2
 test listbox-7.7 {DeleteEls procedure} -body {
     .l delete 0 end
     .l insert 0 a b c d e f g h i j
     .l selection anchor 4
     .l delete 2 5
     .l index anchor
-} -result {2}
+} -result 2
 test listbox-7.8 {DeleteEls procedure} -body {
     .l delete 0 end
     .l insert 0 a b c d e f g h i j
     .l selection anchor 3
     .l delete 4 5
     .l index anchor
-} -result {3}
+} -result 3
 test listbox-7.9 {DeleteEls procedure} -body {
     .l delete 0 end
     .l insert 0 a b c d e f g h i j
@@ -1757,7 +1757,7 @@ test listbox-7.9 {DeleteEls procedure} -body {
     update
     .l delete 1 2
     .l index @0,0
-} -result {1}
+} -result 1
 test listbox-7.10 {DeleteEls procedure} -body {
     .l delete 0 end
     .l insert 0 a b c d e f g h i j
@@ -1765,7 +1765,7 @@ test listbox-7.10 {DeleteEls procedure} -body {
     update
     .l delete 3 4
     .l index @0,0
-} -result {3}
+} -result 3
 test listbox-7.11 {DeleteEls procedure} -body {
     .l delete 0 end
     .l insert 0 a b c d e f g h i j
@@ -1773,7 +1773,7 @@ test listbox-7.11 {DeleteEls procedure} -body {
     update
     .l delete 4 6
     .l index @0,0
-} -result {3}
+} -result 3
 test listbox-7.12 {DeleteEls procedure} -body {
     .l delete 0 end
     .l insert 0 a b c d e f g h i j
@@ -1781,42 +1781,42 @@ test listbox-7.12 {DeleteEls procedure} -body {
     update
     .l delete 3 end
     .l index @0,0
-} -result {1}
+} -result 1
 test listbox-7.13 {DeleteEls procedure, updating view with partial last line} -body {
     mkPartial
     .partial.l yview 8
     update
     .partial.l delete 10 13
     .partial.l index @0,0
-} -result {7}
+} -result 7
 test listbox-7.14 {DeleteEls procedure} -body {
     .l delete 0 end
     .l insert 0 a b c d e f g h i j
     .l activate 6
     .l delete 3 4
     .l index active
-} -result {4}
+} -result 4
 test listbox-7.15 {DeleteEls procedure} -body {
     .l delete 0 end
     .l insert 0 a b c d e f g h i j
     .l activate 6
     .l delete 5 7
     .l index active
-} -result {5}
+} -result 5
 test listbox-7.16 {DeleteEls procedure} -body {
     .l delete 0 end
     .l insert 0 a b c d e f g h i j
     .l activate 6
     .l delete 5 end
     .l index active
-} -result {4}
+} -result 4
 test listbox-7.17 {DeleteEls procedure} -body {
     .l delete 0 end
     .l insert 0 a b c d e f g h i j
     .l activate 6
     .l delete 0 end
     .l index active
-} -result {0}
+} -result 0
 test listbox-7.18 {DeleteEls procedure} -body {
     .l delete 0 end
     .l insert 0 a b c "two words" d e f g h i j
@@ -1987,7 +1987,7 @@ test listbox-10.5 {GetListboxIndex procedure} -setup {
     .l index end
 } -cleanup {
     destroy .l
-} -result {12}
+} -result 12
 test listbox-10.6 {GetListboxIndex procedure} -setup {
     destroy .l
 } -body {
@@ -2102,7 +2102,7 @@ test listbox-10.16 {GetListboxIndex procedure} -setup {
     .l index 3
 } -cleanup {
     destroy .l
-} -result {3}
+} -result 3
 test listbox-10.17 {GetListboxIndex procedure} -setup {
     destroy .l
 } -body {
@@ -2112,7 +2112,7 @@ test listbox-10.17 {GetListboxIndex procedure} -setup {
     .l index 20
 } -cleanup {
     destroy .l
-} -result {12}
+} -result 12
 test listbox-10.18 {GetListboxIndex procedure} -setup {
     destroy .l
 } -body {
@@ -2226,7 +2226,7 @@ test listbox-11.6 {ChangeListboxView procedure, partial last line} -body {
     .partial.l index @0,0
 } -cleanup {
     destroy .l
-} -result {11}
+} -result 11
 
 
 # Listbox used in 12.* tests
@@ -2314,7 +2314,7 @@ test listbox-13.3 {ListboxScanTo procedure} -constraints {
 test listbox-14.1 {NearestListboxElement procedure, partial last line} -body {
     mkPartial
     .partial.l nearest [winfo height .partial.l]
-} -result {4}
+} -result 4
 # Listbox used in 14.* tests
 destroy .l
 listbox .l -font $fixed -width 20 -height 10
@@ -2326,7 +2326,7 @@ test listbox-14.2 {NearestListboxElement procedure} -constraints {
 	fonts
 } -body {
     .l index @50,0
-} -result {4}
+} -result 4
 test listbox-14.3 {NearestListboxElement procedure} -constraints {
 	fonts
 } -body {
@@ -2336,7 +2336,7 @@ test listbox-14.4 {NearestListboxElement procedure} -constraints {
 	fonts
 } -body {
     .l index @50,200
-} -result {13}
+} -result 13
 
 
 # Listbox used in 15.* 16.* and 17.* tests
@@ -2415,7 +2415,7 @@ test listbox-15.9 {ListboxSelect procedure, boundary conditions for indices} -bo
     .l select clear 0 end
     .l select set end 30
     .l curselection
-} -result {5}
+} -result 5
 test listbox-15.10 {ListboxSelect procedure, boundary conditions for indices} -body {
     .l delete 0 end
     .l insert 0 a b c d e f
@@ -2451,7 +2451,7 @@ test listbox-16.3 {ListboxFetchSelection procedure, retrieve in several parts} -
     string compare 1$long\n2$long\n3$long\n4$long\n5$long $sel
 } -cleanup {
     catch {unset long sel}
-} -result {0}
+} -result 0
 
 
 test listbox-17.1 {ListboxLostSelection procedure} -setup {
diff --git a/tests/menu.test b/tests/menu.test
index 5d4884c..c288661 100644
--- a/tests/menu.test
+++ b/tests/menu.test
@@ -270,11 +270,11 @@ test menu-2.27 {configuration options -takefocus {any string}} -body {
 test menu-2.28 {configuration options -tearoff 0} -body {
     .m1 configure -tearoff 0
     .m1 cget -tearoff
-} -result {0}
+} -result 0
 test menu-2.29 {configuration options -tearoff 1} -body {
     .m1 configure -tearoff 1
     .m1 cget -tearoff
-} -result {1}
+} -result 1
 test menu-2.30 {configuration options -tearoffcommand {any old string}} -body {
     .m1 configure -tearoffcommand {any old string}
     .m1 cget -tearoffcommand
@@ -545,12 +545,12 @@ test menu-2.85 {entry configuration options 0 -columnbreak 1 tearoff} -body {
 test menu-2.86 {entry configuration options 1 -columnbreak 1 command} -body {
     .m1 entryconfigure 1 -columnbreak 1
     lindex [.m1 entryconfigure 1 -columnbreak] 4
-} -result {1}
+} -result 1
 
 test menu-2.87 {entry configuration options 2 -columnbreak 1 cascade} -body {
     .m1 entryconfigure 2 -columnbreak 1
     lindex [.m1 entryconfigure 2 -columnbreak] 4
-} -result {1}
+} -result 1
 
 test menu-2.88 {entry configuration options 3 -columnbreak 1 separator} -body {
     .m1 entryconfigure 3 -columnbreak 1
@@ -559,12 +559,12 @@ test menu-2.88 {entry configuration options 3 -columnbreak 1 separator} -body {
 test menu-2.89 {entry configuration options 4 -columnbreak 1 checkbutton} -body {
     .m1 entryconfigure 4 -columnbreak 1
     lindex [.m1 entryconfigure 4 -columnbreak] 4
-} -result {1}
+} -result 1
 
 test menu-2.90 {entry configuration options 5 -columnbreak 1 radiobutton} -body {
     .m1 entryconfigure 5 -columnbreak 1
     lindex [.m1 entryconfigure 5 -columnbreak] 4
-} -result {1}
+} -result 1
 
 test menu-2.91 {entry configuration options 0 -command beep tearoff} -body {
     .m1 entryconfigure 0 -command beep
@@ -829,12 +829,12 @@ test menu-2.142 {entry configuration options 3 -indicatoron 1 separator} -body {
 test menu-2.143 {entry configuration options 4 -indicatoron 1 checkbutton} -body {
     .m1 entryconfigure 4 -indicatoron 1
     lindex [.m1 entryconfigure 4 -indicatoron] 4
-} -result {1}
+} -result 1
 
 test menu-2.144 {entry configuration options 5 -indicatoron 1 radiobutton} -body {
     .m1 entryconfigure 5 -indicatoron 1
     lindex [.m1 entryconfigure 5 -indicatoron] 4
-} -result {1}
+} -result 1
 
 test menu-2.145 {entry configuration options 0 -label test tearoff} -body {
     .m1 entryconfigure 0 -label test
@@ -1172,12 +1172,12 @@ test menu-2.217 {entry configuration options 0 -underline 0 tearoff} -body {
 test menu-2.218 {entry configuration options 1 -underline 0 command} -body {
     .m1 entryconfigure 1 -underline 0
     lindex [.m1 entryconfigure 1 -underline] 4
-} -result {0}
+} -result 0
 
 test menu-2.219 {entry configuration options 2 -underline 0 cascade} -body {
     .m1 entryconfigure 2 -underline 0
     lindex [.m1 entryconfigure 2 -underline] 4
-} -result {0}
+} -result 0
 
 test menu-2.220 {entry configuration options 3 -underline 0 separator} -body {
     .m1 entryconfigure 3 -underline 0
@@ -1186,12 +1186,12 @@ test menu-2.220 {entry configuration options 3 -underline 0 separator} -body {
 test menu-2.221 {entry configuration options 4 -underline 0 checkbutton} -body {
     .m1 entryconfigure 4 -underline 0
     lindex [.m1 entryconfigure 4 -underline] 4
-} -result {0}
+} -result 0
 
 test menu-2.222 {entry configuration options 5 -underline 0 radiobutton} -body {
     .m1 entryconfigure 5 -underline 0
     lindex [.m1 entryconfigure 5 -underline] 4
-} -result {0}
+} -result 0
 
 test menu-2.223 {entry configuration options 0 -underline 3p tearoff} -body {
     .m1 entryconfigure 0 -underline 3p
@@ -1367,7 +1367,7 @@ test menu-3.18 {MenuWidgetCmd procedure, "configure" option} -setup {
     llength [.m1 configure]
 } -cleanup {
 	destroy .m1
-} -result {21}
+} -result 21
 test menu-3.19 {MenuWidgetCmd procedure, "configure" option} -setup {
 	destroy .m1
 } -body {
@@ -1519,7 +1519,7 @@ test menu-3.36 {MenuWidgetCmd procedure, "entryconfigure" option} -setup {
     llength [.m1 entryconfigure 1]
 } -cleanup {
 	destroy .m1
-} -result {15}
+} -result 15
 test menu-3.37 {MenuWidgetCmd procedure, "entryconfigure" option} -setup {
 	destroy .m1
 } -body {
@@ -1787,7 +1787,7 @@ test menu-3.66a {MenuWidgetCmd procedure, "yposition" option, no tearoff} -setup
     .m1 yposition 1
 } -cleanup {
 	destroy .m1
-} -result {0}
+} -result 0
 test menu-3.66b {MenuWidgetCmd procedure, "yposition" option, with tearoff} -constraints {
     notAqua
 } -setup {
@@ -1799,7 +1799,7 @@ test menu-3.66b {MenuWidgetCmd procedure, "yposition" option, with tearoff} -con
     .m1 yposition 1
 } -cleanup {
 	destroy .m1
-} -result {1}
+} -result 1
 test menu-3.66c {MenuWidgetCmd procedure, "yposition" option, with tearoff} -constraints {
     aqua
 } -setup {
@@ -1811,7 +1811,7 @@ test menu-3.66c {MenuWidgetCmd procedure, "yposition" option, with tearoff} -con
     .m1 yposition 1
 } -cleanup {
 	destroy .m1
-} -result {0}
+} -result 0
 test menu-3.67 {MenuWidgetCmd procedure, bad option} -setup {
 	destroy .m1
 } -body {
@@ -1878,7 +1878,7 @@ test menu-4.2 {TkInvokeMenu: tearoff} -setup {
 	catch {.m1 invoke 0}
 } -cleanup {
     deleteWindows
-} -result {0}
+} -result 0
 test menu-4.3 {TkInvokeMenu: checkbutton -on} -setup {
     destroy .m1
 } -body {
@@ -2139,7 +2139,7 @@ test menu-6.5 {TkDestroyMenu} -setup {
     .m1 clone .m2
     destroy .m1
     winfo exists .m2
-} -result {0}
+} -result 0
 test menu-6.6 {TkDestroyMenu} -setup {
     destroy .m1 .m2
 } -body {
@@ -3375,7 +3375,7 @@ test menu-22.1 {GetIndexFromCoords} -setup {
     .m1 index @5
 } -cleanup {
     deleteWindows
-} -result {0}
+} -result 0
 test menu-22.2 {GetIndexFromCoords} -setup {
     deleteWindows
 } -body {
@@ -3385,7 +3385,7 @@ test menu-22.2 {GetIndexFromCoords} -setup {
     .m1 index @5,5
 } -cleanup {
     deleteWindows
-} -result {0}
+} -result 0
 test menu-22.3 {GetIndexFromCoords: mapped window, y only} -setup {
     deleteWindows
 } -constraints {x11} -body {
@@ -3397,7 +3397,7 @@ test menu-22.3 {GetIndexFromCoords: mapped window, y only} -setup {
     .m1 index @5
 } -cleanup {
     deleteWindows
-} -result {0}
+} -result 0
 test menu-22.4 {GetIndexFromCoords: mapped window x,y} -setup {
     deleteWindows
 } -constraints {x11} -body {
@@ -3411,7 +3411,7 @@ test menu-22.4 {GetIndexFromCoords: mapped window x,y} -setup {
     .m1 index @$x,5
 } -cleanup {
     deleteWindows
-} -result {0}
+} -result 0
 test menu-22.5 {GetIndexFromCoords: mapped wide window} -setup {
     deleteWindows
 } -constraints {x11} -body {
@@ -3426,7 +3426,7 @@ test menu-22.5 {GetIndexFromCoords: mapped wide window} -setup {
     .m1 index @$x,5
 } -cleanup {
     deleteWindows
-} -result {0}
+} -result 0
 
 test menu-23.1 {RecursivelyDeleteMenu} -setup {
     deleteWindows
@@ -3965,7 +3965,7 @@ test menu-38.1 {Can't dismiss ttk::menubutton menu until mouse has hovered over
     winfo ismapped .top.mb.m
 } -cleanup {
     destroy .top.mb.m .top.m .top
-} -result {0}
+} -result 0
 
 
 # cleanup
diff --git a/tests/menubut.test b/tests/menubut.test
index d245fd0..b8a52a9 100644
--- a/tests/menubut.test
+++ b/tests/menubut.test
@@ -71,7 +71,7 @@ test menubutton-1.9 {configuration options} -body {
     .mb cget -bd
 } -cleanup {
     .mb configure -bd [lindex [.mb configure -bd] 3]
-} -result {4}
+} -result 4
 test menubutton-1.10 {configuration options} -body {
     .mb configure -bd badValue
 } -returnCodes error -result {bad screen distance "badValue"}
@@ -98,7 +98,7 @@ test menubutton-1.15 {configuration options} -body {
     .mb cget -borderwidth
 } -cleanup {
     .mb configure -borderwidth [lindex [.mb configure -borderwidth] 3]
-} -result {1}
+} -result 1
 test menubutton-1.16 {configuration options} -body {
     .mb configure -borderwidth badValue
 } -returnCodes error -result {bad screen distance "badValue"}
@@ -158,7 +158,7 @@ test menubutton-1.28 {configuration options} -body {
     .mb cget -height
 } -cleanup {
     .mb configure -height [lindex [.mb configure -height] 3]
-} -result {18}
+} -result 18
 test menubutton-1.29 {configuration options} -body {
     .mb configure -height 20.0
 } -returnCodes error -result {expected integer but got "20.0"}
@@ -185,7 +185,7 @@ test menubutton-1.34 {configuration options} -body {
     .mb cget -highlightthickness
 } -cleanup {
     .mb configure -highlightthickness [lindex [.mb configure -highlightthickness] 3]
-} -result {18}
+} -result 18
 test menubutton-1.35 {configuration options} -body {
     .mb configure -highlightthickness badValue
 } -returnCodes error -result {bad screen distance "badValue"}
@@ -213,7 +213,7 @@ test menubutton-1.38 {configuration options} -body {
     .mb cget -indicatoron
 } -cleanup {
     .mb configure -indicatoron [lindex [.mb configure -indicatoron] 3]
-} -result {1}
+} -result 1
 test menubutton-1.39 {configuration options} -body {
     .mb configure -indicatoron no_way
 } -returnCodes error -result {expected boolean value but got "no_way"}
@@ -237,7 +237,7 @@ test menubutton-1.43 {configuration options} -body {
     .mb cget -padx
 } -cleanup {
     .mb configure -padx [lindex [.mb configure -padx] 3]
-} -result {12}
+} -result 12
 test menubutton-1.44 {configuration options} -body {
     .mb configure -padx 420x
 } -returnCodes error -result {bad screen distance "420x"}
@@ -246,7 +246,7 @@ test menubutton-1.45 {configuration options} -body {
     .mb cget -pady
 } -cleanup {
     .mb configure -pady [lindex [.mb configure -pady] 3]
-} -result {12}
+} -result 12
 test menubutton-1.46 {configuration options} -body {
     .mb configure -pady 420x
 } -returnCodes error -result {bad screen distance "420x"}
@@ -291,7 +291,7 @@ test menubutton-1.54 {configuration options} -body {
     .mb cget -underline
 } -cleanup {
     .mb configure -underline [lindex [.mb configure -underline] 3]
-} -result {5}
+} -result 5
 test menubutton-1.55 {configuration options} -body {
     .mb configure -underline 3p
 } -returnCodes error -result {expected integer but got "3p"}
@@ -300,7 +300,7 @@ test menubutton-1.56 {configuration options} -body {
     .mb cget -width
 } -cleanup {
     .mb configure -width [lindex [.mb configure -width] 3]
-} -result {402}
+} -result 402
 test menubutton-1.57 {configuration options} -body {
     .mb configure -width 3p
 } -returnCodes error -result {expected integer but got "3p"}
@@ -309,7 +309,7 @@ test menubutton-1.58 {configuration options} -body {
     .mb cget -wraplength
 } -cleanup {
     .mb configure -wraplength [lindex [.mb configure -wraplength] 3]
-} -result {100}
+} -result 100
 test menubutton-1.59 {configuration options} -body {
     .mb configure -wraplength 6x
 } -returnCodes error -result {bad screen distance "6x"}
@@ -364,10 +364,10 @@ test menubutton-3.5 {ButtonWidgetCmd procedure, "cget" option} -body {
 test menubutton-3.6 {ButtonWidgetCmd procedure, "cget" option} -body {
     .mb configure -highlightthickness 3
     .mb cget -highlightthickness
-} -result {3}
+} -result 3
 test menubutton-3.7 {ButtonWidgetCmd procedure, "configure" option} -body {
     llength [.mb configure]
-} -result {33}
+} -result 33
 test menubutton-3.8 {ButtonWidgetCmd procedure, "configure" option} -body {
     .mb configure -gorp
 } -returnCodes error -result {unknown option "-gorp"}
diff --git a/tests/message.test b/tests/message.test
index 2ca6921..02c04f4 100644
--- a/tests/message.test
+++ b/tests/message.test
@@ -41,7 +41,7 @@ test message-1.3 {configuration option: "aspect"} -setup {
     .m cget -aspect
 } -cleanup {
     destroy .m
-} -result {3}
+} -result 3
 test message-1.4 {configuration option: "aspect"} -setup {
     message .m -borderwidth 2 -highlightthickness 2 -font {Helvetica -12 bold}
     pack .m
@@ -81,7 +81,7 @@ test message-1.7 {configuration option: "bd"} -setup {
     .m cget -bd
 } -cleanup {
     destroy .m
-} -result {4}
+} -result 4
 test message-1.8 {configuration option: "bd"} -setup {
     message .m -borderwidth 2 -highlightthickness 2 -font {Helvetica -12 bold}
     pack .m
@@ -121,7 +121,7 @@ test message-1.11 {configuration option: "borderwidth"} -setup {
     .m cget -borderwidth
 } -cleanup {
     destroy .m
-} -result {1}
+} -result 1
 test message-1.12 {configuration option: "borderwidth"} -setup {
     message .m -borderwidth 2 -highlightthickness 2 -font {Helvetica -12 bold}
     pack .m
@@ -261,7 +261,7 @@ test message-1.25 {configuration option: "highlightthickness"} -setup {
     .m cget -highlightthickness
 } -cleanup {
     destroy .m
-} -result {2}
+} -result 2
 test message-1.26 {configuration option: "highlightthickness"} -setup {
     message .m -borderwidth 2 -highlightthickness 2 -font {Helvetica -12 bold}
     pack .m
@@ -383,7 +383,7 @@ test message-1.37 {configuration option: "width"} -setup {
     .m cget -width
 } -cleanup {
     destroy .m
-} -result {2}
+} -result 2
 test message-1.38 {configuration option: "width"} -setup {
     message .m -borderwidth 2 -highlightthickness 2 -font {Helvetica -12 bold}
     pack .m
@@ -452,7 +452,7 @@ test message-3.5 {MessageWidgetObjCmd procedure, "configure"} -setup {
     llength [.m configure]
 } -cleanup {
     destroy .m
-} -result {21}
+} -result 21
 test message-3.6 {MessageWidgetObjCmd procedure, "configure"} -setup {
     message .m
 } -body {
@@ -468,7 +468,7 @@ test message-3.7 {MessageWidgetObjCmd procedure, "configure"} -setup {
     lindex [.m configure -bd] 4
 } -cleanup {
     destroy .m
-} -result {4}
+} -result 4
 
 test message-4.1 {Bug [5d991b822e]} {
     # Want this not to segfault, or write to variable with empty name
diff --git a/tests/pack.test b/tests/pack.test
index 4a41516..c65727e 100644
--- a/tests/pack.test
+++ b/tests/pack.test
@@ -1639,7 +1639,7 @@ test pack-20.1 {<<NoManagedChild>> fires on last pack forget} -setup {
 } -cleanup {
     bind . <<NoManagedChild>> {}
     destroy .1
-} -result {1}
+} -result 1
 test pack-20.2 {<<NoManagedChild>> fires on last packed child destruction} -setup {
     global A
     unset -nocomplain A
@@ -1653,7 +1653,7 @@ test pack-20.2 {<<NoManagedChild>> fires on last packed child destruction} -setu
 } -cleanup {
     bind . <<NoManagedChild>> {}
     destroy .1
-} -result {1}
+} -result 1
 test pack-20.3 {<Configure> does not fire on last pack forget} -setup {
     global A
     unset -nocomplain A
@@ -1667,7 +1667,7 @@ test pack-20.3 {<Configure> does not fire on last pack forget} -setup {
 } -cleanup {
     bind . <Configure> {}
     destroy .1
-} -result {0}
+} -result 0
 test pack-20.4 {<<NoManagedChild>> does not fire on forelast pack forget} -setup {
     global A
     unset -nocomplain A
@@ -1682,7 +1682,7 @@ test pack-20.4 {<<NoManagedChild>> does not fire on forelast pack forget} -setup
 } -cleanup {
     bind . <<NoManagedChild>> {}
     destroy .1 .2
-} -result {0}
+} -result 0
 test pack-20.5 {<Configure> does not fire on last pack forget} -setup {
     global A
     unset -nocomplain A
@@ -1697,7 +1697,7 @@ test pack-20.5 {<Configure> does not fire on last pack forget} -setup {
 } -cleanup {
     bind . <Configure> {}
     destroy .1 .2
-} -result {1}
+} -result 1
 test pack-20.6 {<<NoManagedChild>> does not fire on last pack forget if propagation is off} -setup {
     global A
     unset -nocomplain A
@@ -1712,7 +1712,7 @@ test pack-20.6 {<<NoManagedChild>> does not fire on last pack forget if propagat
 } -cleanup {
     bind . <<NoManagedChild>> {}
     destroy .1
-} -result {0}
+} -result 0
 
 # cleanup
 cleanupTests
diff --git a/tests/panedwindow.test b/tests/panedwindow.test
index ea407a0..3786ef8 100644
--- a/tests/panedwindow.test
+++ b/tests/panedwindow.test
@@ -4562,7 +4562,7 @@ test panedwindow-22.2 {PanedWindowReqProc, react to slave geometry changes} -set
     expr {[lindex $result 1] - [lindex $result 0]}
 } -cleanup {
 	deleteWindows
-} -result {10}
+} -result 10
 
 
 test panedwindow-23.1 {ConfigurePanes, can't add panedwindow to itself} -setup {
@@ -5461,7 +5461,7 @@ test panedwindow-27.2 {destroy the window cleanly on rename [Bug #616589]} -setu
     winfo exists .p
 } -cleanup {
 	deleteWindows
-} -result {0}
+} -result 0
 
 
 test panedwindow-28.1 {resizing width} -setup {
diff --git a/tests/place.test b/tests/place.test
index e04ee0a..975732a 100644
--- a/tests/place.test
+++ b/tests/place.test
@@ -62,7 +62,7 @@ test place-2.2 {ConfigureSlave procedure, -height option} -setup {
     place .t.f2 -in .t.f -height 40
     update
     winfo height .t.f2
-} -result {40}
+} -result 40
 test place-2.3 {ConfigureSlave procedure, -height option} -setup {
     place forget .t.f2
 } -body {
@@ -71,7 +71,7 @@ test place-2.3 {ConfigureSlave procedure, -height option} -setup {
     place .t.f2 -height {}
     update
     winfo height .t.f2
-} -result {60}
+} -result 60
 
 
 test place-3.1 {ConfigureSlave procedure, -relheight option} -body {
@@ -83,7 +83,7 @@ test place-3.2 {ConfigureSlave procedure, -relheight option} -setup {
     place .t.f2 -in .t.f -relheight .5
     update
     winfo height .t.f2
-} -result {40}
+} -result 40
 test place-3.3 {ConfigureSlave procedure, -relheight option} -setup {
     place forget .t.f2
 } -body {
@@ -92,7 +92,7 @@ test place-3.3 {ConfigureSlave procedure, -relheight option} -setup {
     place .t.f2 -relheight {}
     update
     winfo height .t.f2
-} -result {60}
+} -result 60
 
 
 test place-4.1 {ConfigureSlave procedure, bad -in options} -setup {
@@ -148,7 +148,7 @@ test place-5.2 {ConfigureSlave procedure, -relwidth option} -setup {
     place .t.f2 -in .t.f -relwidth .5
     update
     winfo width .t.f2
-} -result {75}
+} -result 75
 test place-5.3 {ConfigureSlave procedure, -relwidth option} -setup {
     place forget .t.f2
 } -body {
@@ -157,7 +157,7 @@ test place-5.3 {ConfigureSlave procedure, -relwidth option} -setup {
     place .t.f2 -relwidth {}
     update
     winfo width .t.f2
-} -result {30}
+} -result 30
 
 test place-6.1 {ConfigureSlave procedure, -width option} -body {
     place .t.f2 -width abcd
@@ -168,7 +168,7 @@ test place-6.2 {ConfigureSlave procedure, -width option} -setup {
     place .t.f2 -in .t.f -width 100
     update
     winfo width .t.f2
-} -result {100}
+} -result 100
 test place-6.3 {ConfigureSlave procedure, -width option} -setup {
     place forget .t.f2
 } -body {
@@ -177,7 +177,7 @@ test place-6.3 {ConfigureSlave procedure, -width option} -setup {
     place .t.f2 -width {}
     update
     winfo width .t.f2
-} -result {30}
+} -result 30
 
 
 test place-7.1 {ReconfigurePlacement procedure, computing position} -setup {
diff --git a/tests/safePrimarySelection.test b/tests/safePrimarySelection.test
index 7cc31f4..7c27c88 100644
--- a/tests/safePrimarySelection.test
+++ b/tests/safePrimarySelection.test
@@ -281,7 +281,7 @@ test safePrimarySelection-1.6 {master interpreter, spinbox spun, no existing sel
 } -cleanup {
     destroy {*}[winfo children .]
     ::_test_tmp::clearPrimarySelection
-} -result {2}
+} -result 2
 
 test safePrimarySelection-1.7 {master interpreter, spinbox spun/selected/spun, no existing selection} -setup {
     catch {interp delete slave2}
@@ -293,7 +293,7 @@ test safePrimarySelection-1.7 {master interpreter, spinbox spun/selected/spun, n
 } -cleanup {
     destroy {*}[winfo children .]
     ::_test_tmp::clearPrimarySelection
-} -result {3}
+} -result 3
 
 test safePrimarySelection-1.8 {master interpreter, ttk::spinbox as entry, no existing selection} -setup {
     catch {interp delete slave2}
@@ -317,7 +317,7 @@ test safePrimarySelection-1.9 {master interpreter, ttk::spinbox spun, no existin
 } -cleanup {
     destroy {*}[winfo children .]
     ::_test_tmp::clearPrimarySelection
-} -result {2}
+} -result 2
 
 test safePrimarySelection-1.10 {master interpreter, ttk::spinbox spun/selected/spun, no existing selection} -setup {
     catch {interp delete slave2}
@@ -329,7 +329,7 @@ test safePrimarySelection-1.10 {master interpreter, ttk::spinbox spun/selected/s
 } -cleanup {
     destroy {*}[winfo children .]
     ::_test_tmp::clearPrimarySelection
-} -result {3}
+} -result 3
 
 test safePrimarySelection-2.1 {unsafe slave interpreter, text, no existing selection} -setup {
     catch {interp delete slave2}
@@ -431,7 +431,7 @@ test safePrimarySelection-2.6 {unsafe slave interpreter, spinbox spun, no existi
     destroy {*}[winfo children .]
     unset int2
     ::_test_tmp::clearPrimarySelection
-} -result {2}
+} -result 2
 
 test safePrimarySelection-2.7 {unsafe slave interpreter, spinbox spun/selected/spun, no existing selection} -setup {
     catch {interp delete slave2}
@@ -448,7 +448,7 @@ test safePrimarySelection-2.7 {unsafe slave interpreter, spinbox spun/selected/s
     destroy {*}[winfo children .]
     unset int2
     ::_test_tmp::clearPrimarySelection
-} -result {3}
+} -result 3
 
 test safePrimarySelection-2.8 {unsafe slave interpreter, ttk::spinbox as entry, no existing selection} -setup {
     catch {interp delete slave2}
@@ -482,7 +482,7 @@ test safePrimarySelection-2.9 {unsafe slave interpreter, ttk::spinbox spun, no e
     destroy {*}[winfo children .]
     unset int2
     ::_test_tmp::clearPrimarySelection
-} -result {2}
+} -result 2
 
 test safePrimarySelection-2.10 {unsafe slave interpreter, ttk::spinbox spun/selected/spun, no existing selection} -setup {
     catch {interp delete slave2}
@@ -499,7 +499,7 @@ test safePrimarySelection-2.10 {unsafe slave interpreter, ttk::spinbox spun/sele
     destroy {*}[winfo children .]
     unset int2
     ::_test_tmp::clearPrimarySelection
-} -result {3}
+} -result 3
 
 test safePrimarySelection-3.1 {IMPORTANT, safe slave interpreter, text, no existing selection} -setup {
     catch {interp delete slave2}
@@ -781,7 +781,7 @@ test safePrimarySelection-4.6 {master interpreter, spinbox spun, existing select
 } -cleanup {
     destroy {*}[winfo children .]
     ::_test_tmp::clearPrimarySelection
-} -result {2}
+} -result 2
 
 test safePrimarySelection-4.7 {master interpreter, spinbox spun/selected/spun, existing selection} -setup {
     catch {interp delete slave2}
@@ -793,7 +793,7 @@ test safePrimarySelection-4.7 {master interpreter, spinbox spun/selected/spun, e
 } -cleanup {
     destroy {*}[winfo children .]
     ::_test_tmp::clearPrimarySelection
-} -result {3}
+} -result 3
 
 test safePrimarySelection-4.8 {master interpreter, ttk::spinbox as entry, existing selection} -setup {
     catch {interp delete slave2}
@@ -817,7 +817,7 @@ test safePrimarySelection-4.9 {master interpreter, ttk::spinbox spun, existing s
 } -cleanup {
     destroy {*}[winfo children .]
     ::_test_tmp::clearPrimarySelection
-} -result {2}
+} -result 2
 
 test safePrimarySelection-4.10 {master interpreter, ttk::spinbox spun/selected/spun, existing selection} -setup {
     catch {interp delete slave2}
@@ -829,7 +829,7 @@ test safePrimarySelection-4.10 {master interpreter, ttk::spinbox spun/selected/s
 } -cleanup {
     destroy {*}[winfo children .]
     ::_test_tmp::clearPrimarySelection
-} -result {3}
+} -result 3
 
 test safePrimarySelection-5.1 {unsafe slave interpreter, text, existing selection} -setup {
     catch {interp delete slave2}
@@ -931,7 +931,7 @@ test safePrimarySelection-5.6 {unsafe slave interpreter, spinbox spun, existing
     destroy {*}[winfo children .]
     unset int2
     ::_test_tmp::clearPrimarySelection
-} -result {2}
+} -result 2
 
 test safePrimarySelection-5.7 {unsafe slave interpreter, spinbox spun/selected/spun, existing selection} -setup {
     catch {interp delete slave2}
@@ -948,7 +948,7 @@ test safePrimarySelection-5.7 {unsafe slave interpreter, spinbox spun/selected/s
     destroy {*}[winfo children .]
     unset int2
     ::_test_tmp::clearPrimarySelection
-} -result {3}
+} -result 3
 
 test safePrimarySelection-5.8 {unsafe slave interpreter, ttk::spinbox as entry, existing selection} -setup {
     catch {interp delete slave2}
@@ -982,7 +982,7 @@ test safePrimarySelection-5.9 {unsafe slave interpreter, ttk::spinbox spun, exis
     destroy {*}[winfo children .]
     unset int2
     ::_test_tmp::clearPrimarySelection
-} -result {2}
+} -result 2
 
 test safePrimarySelection-5.10 {unsafe slave interpreter, ttk::spinbox spun/selected/spun, existing selection} -setup {
     catch {interp delete slave2}
@@ -999,7 +999,7 @@ test safePrimarySelection-5.10 {unsafe slave interpreter, ttk::spinbox spun/sele
     destroy {*}[winfo children .]
     unset int2
     ::_test_tmp::clearPrimarySelection
-} -result {3}
+} -result 3
 
 test safePrimarySelection-6.1 {IMPORTANT, safe slave interpreter, text, existing selection} -setup {
     catch {interp delete slave2}
diff --git a/tests/scale.test b/tests/scale.test
index 955092b..2c3a8c2 100644
--- a/tests/scale.test
+++ b/tests/scale.test
@@ -46,7 +46,7 @@ test scale-1.5 {configuration options} -body {
     .s cget -bd
 } -cleanup {
     .s configure -bd [lindex [.s configure -bd] 3]
-} -result {4}
+} -result 4
 test scale-1.6 {configuration options} -body {
         .s configure -bd badValue
 } -returnCodes error -result {bad screen distance "badValue"}
@@ -73,7 +73,7 @@ test scale-1.11 {configuration options} -body {
     .s cget -borderwidth
 } -cleanup {
     .s configure -borderwidth [lindex [.s configure -borderwidth] 3]
-} -result {1}
+} -result 1
 test scale-1.12 {configuration options} -body {
         .s configure -borderwidth badValue
 } -returnCodes error -result {bad screen distance "badValue"}
@@ -97,7 +97,7 @@ test scale-1.17 {configuration options} -body {
     .s cget -digits
 } -cleanup {
     .s configure -digits [lindex [.s configure -digits] 3]
-} -result {5}
+} -result 5
 test scale-1.18 {configuration options} -body {
         .s configure -digits badValue
 } -returnCodes error -result {expected integer but got "badValue"}
@@ -157,7 +157,7 @@ test scale-1.31 {configuration options} -body {
     .s cget -highlightthickness
 } -cleanup {
     .s configure -highlightthickness [lindex [.s configure -highlightthickness] 3]
-} -result {2}
+} -result 2
 test scale-1.32 {configuration options} -body {
         .s configure -highlightthickness badValue
 } -returnCodes error -result {bad screen distance "badValue"}
@@ -172,7 +172,7 @@ test scale-1.35 {configuration options} -body {
     .s cget -length
 } -cleanup {
     .s configure -length [lindex [.s configure -length] 3]
-} -result {130}
+} -result 130
 test scale-1.36 {configuration options} -body {
         .s configure -length badValue
 } -returnCodes error -result {bad screen distance "badValue"}
@@ -205,7 +205,7 @@ test scale-1.43 {configuration options} -body {
     .s cget -repeatdelay
 } -cleanup {
     .s configure -repeatdelay [lindex [.s configure -repeatdelay] 3]
-} -result {14}
+} -result 14
 test scale-1.44 {configuration options} -body {
         .s configure -repeatdelay bogus
 } -returnCodes error -result {expected integer but got "bogus"}
@@ -214,7 +214,7 @@ test scale-1.45 {configuration options} -body {
     .s cget -repeatinterval
 } -cleanup {
     .s configure -repeatinterval [lindex [.s configure -repeatinterval] 3]
-} -result {14}
+} -result 14
 test scale-1.46 {configuration options} -body {
         .s configure -repeatinterval bogus
 } -returnCodes error -result {expected integer but got "bogus"}
@@ -232,7 +232,7 @@ test scale-1.49 {configuration options} -body {
     .s cget -showvalue
 } -cleanup {
     .s configure -showvalue [lindex [.s configure -showvalue] 3]
-} -result {0}
+} -result 0
 test scale-1.50 {configuration options} -body {
         .s configure -showvalue badValue
 } -returnCodes error -result {expected boolean value but got "badValue"}
@@ -241,7 +241,7 @@ test scale-1.51 {configuration options} -body {
     .s cget -sliderlength
 } -cleanup {
     .s configure -sliderlength [lindex [.s configure -sliderlength] 3]
-} -result {86}
+} -result 86
 test scale-1.52 {configuration options} -body {
         .s configure -sliderlength badValue
 } -returnCodes error -result {bad screen distance "badValue"}
@@ -313,7 +313,7 @@ test scale-1.69 {configuration options} -body {
     .s cget -width
 } -cleanup {
     .s configure -width [lindex [.s configure -width] 3]
-} -result {32}
+} -result 32
 test scale-1.70 {configuration options} -body {
         .s configure -width badValue
 } -returnCodes error -result {bad screen distance "badValue"}
@@ -359,7 +359,7 @@ test scale-3.4 {ScaleWidgetCmd procedure, cget option} -body {
 test scale-3.5 {ScaleWidgetCmd procedure, cget option} -body {
     .s configure -highlightthickness 2
     .s cget -highlightthickness
-} -result {2}
+} -result 2
 test scale-3.6 {ScaleWidgetCmd procedure, configure option} -body {
     list [llength [.s configure]] [lindex [.s configure] 6]
 } -result {33 {-command command Command {} {}}}
@@ -466,7 +466,7 @@ test scale-3.28 {ScaleWidgetCmd procedure, set option} -body {
     .s set 181
     .s configure -state normal
     .s get
-} -result {118}
+} -result 118
 test scale-3.29 {ScaleWidgetCmd procedure} -body {
     .s dumb
 } -returnCodes error -result {bad option "dumb": must be cget, configure, coords, get, identify, or set}
@@ -588,27 +588,27 @@ test scale-6.1 {ComputeFormat procedure} -body {
     .s configure -from 10 -to 100 -resolution 10
     .s set 49.3
     .s get
-} -result {50}
+} -result 50
 test scale-6.2 {ComputeFormat procedure} -body {
     .s configure -from 100 -to 1000 -resolution 100
     .s set 493
     .s get
-} -result {500}
+} -result 500
 test scale-6.3 {ComputeFormat procedure} -body {
     .s configure -from 1000 -to 10000 -resolution 1000
     .s set 4930
     .s get
-} -result {5000}
+} -result 5000
 test scale-6.4 {ComputeFormat procedure} -body {
     .s configure -from 10000 -to 100000 -resolution 10000
     .s set 49000
     .s get
-} -result {50000}
+} -result 50000
 test scale-6.5 {ComputeFormat procedure} -body {
     .s configure -from 100000 -to 1000000 -resolution 100000
     .s set 493000
     .s get
-} -result {500000}
+} -result 500000
 test scale-6.6 {ComputeFormat procedure} -constraints {
 	nonPortable
 } -body {
@@ -617,7 +617,7 @@ test scale-6.6 {ComputeFormat procedure} -constraints {
     .s configure -from 1000000 -to 10000000 -resolution 1000000
     .s set 4930000
     .s get
-} -result {5000000}
+} -result 5000000
 test scale-6.7 {ComputeFormat procedure} -body {
     .s configure -from 1000000000 -to 10000000000 -resolution 1000000000
     .s set 4930000000
@@ -652,7 +652,7 @@ test scale-6.13 {ComputeFormat procedure} -body {
     .s configure -from .000001 -to .00001 -resolution .000001
     .s set .000006
     expr {[.s get] == 6.0e-06}
-} -result {1}
+} -result 1
 test scale-6.14 {ComputeFormat procedure} -body {
     .s configure -to .00001 -from .0001 -resolution .00001
     .s set .00006
@@ -662,17 +662,17 @@ test scale-6.15 {ComputeFormat procedure} -body {
     .s configure -to .000001 -from .00001 -resolution .000001
     .s set .000006
     expr {[.s get] == 6.0e-06}
-} -result {1}
+} -result 1
 test scale-6.16 {ComputeFormat procedure} -body {
     .s configure -from .00001 -to .0001 -resolution .00001 -digits 1
     .s set .00006
     expr {[.s get] == 6e-05}
-} -result {1}
+} -result 1
 test scale-6.17 {ComputeFormat procedure} -body {
     .s configure -from 10000000 -to 100000000 -resolution 10000000 -digits 3
     .s set 49300000
     .s get
-} -result {50000000}
+} -result 50000000
 test scale-6.18 {ComputeFormat procedure} -body {
     .s configure -length 200 -from 0 -to 10 -resolution 0 -digits 0
     .s set .111111111
@@ -1205,7 +1205,7 @@ test scale-14a.1 {RoundValueToResolution, RoundIntervalToResolution procedures}
     .s get 200 0
 } -cleanup {
     destroy .s
-} -result {5}
+} -result 5
 test scale-14a.2 {RoundValueToResolution, RoundIntervalToResolution procedures} -setup {
     pack [scale .s -orient horizontal]
     update
@@ -1344,7 +1344,7 @@ test scale-17.1 {bug fix 1786} -setup {
     return $x
 } -cleanup {
     deleteWindows
-} -result {100}
+} -result 100
 
 
 test scale-18.1 {DestroyScale, -cursor option [Bug: 3897]} -setup {
diff --git a/tests/spinbox.test b/tests/spinbox.test
index 2d03cf1..8856c9e 100644
--- a/tests/spinbox.test
+++ b/tests/spinbox.test
@@ -93,7 +93,7 @@ test spinbox-1.5 {configuration option: "bd"} -setup {
     .e cget -bd
 } -cleanup {
     destroy .e
-} -result {4}
+} -result 4
 test spinbox-1.6 {configuration option: "bd" for spinbox} -setup {
         spinbox .e -borderwidth 2 -highlightthickness 2 -font {Helvetica -12} \
         -relief sunken
@@ -137,7 +137,7 @@ test spinbox-1.9 {configuration option: "borderwidth"} -setup {
     .e cget -borderwidth
 } -cleanup {
     destroy .e
-} -result {1}
+} -result 1
 test spinbox-1.10 {configuration option: "borderwidth" for spinbox} -setup {
         spinbox .e -borderwidth 2 -highlightthickness 2 -font {Helvetica -12} \
         -relief sunken
@@ -281,7 +281,7 @@ test spinbox-1.22 {configuration option: "exportselection"} -setup {
     .e cget -exportselection
 } -cleanup {
     destroy .e
-} -result {1}
+} -result 1
 test spinbox-1.23 {configuration option: "exportselection" for spinbox} -setup {
         spinbox .e -borderwidth 2 -highlightthickness 2 -font {Helvetica -12} \
         -relief sunken
@@ -457,7 +457,7 @@ test spinbox-1.38 {configuration option: "highlightthickness"} -setup {
     .e cget -highlightthickness
 } -cleanup {
     destroy .e
-} -result {6}
+} -result 6
 test spinbox-1.39 {configuration option: "highlightthickness" for spinbox} -setup {
         spinbox .e -borderwidth 2 -highlightthickness 2 -font {Helvetica -12} \
         -relief sunken
@@ -479,7 +479,7 @@ test spinbox-1.40 {configuration option: "highlightthickness"} -setup {
     .e cget -highlightthickness
 } -cleanup {
     destroy .e
-} -result {0}
+} -result 0
 
 test spinbox-1.41 {configuration option: "increment"} -setup {
         spinbox .e -borderwidth 2 -highlightthickness 2 -font {Helvetica -12} \
@@ -535,7 +535,7 @@ test spinbox-1.45 {configuration option: "insertborderwidth"} -setup {
     .e cget -insertborderwidth
 } -cleanup {
     destroy .e
-} -result {1}
+} -result 1
 test spinbox-1.46 {configuration option: "insertborderwidth" for spinbox} -setup {
         spinbox .e -borderwidth 2 -highlightthickness 2 -font {Helvetica -12} \
         -relief sunken
@@ -557,7 +557,7 @@ test spinbox-1.47 {configuration option: "insertofftime"} -setup {
     .e cget -insertofftime
 } -cleanup {
     destroy .e
-} -result {100}
+} -result 100
 test spinbox-1.48 {configuration option: "insertofftime" for spinbox} -setup {
         spinbox .e -borderwidth 2 -highlightthickness 2 -font {Helvetica -12} \
         -relief sunken
@@ -579,7 +579,7 @@ test spinbox-1.49 {configuration option: "insertontime"} -setup {
     .e cget -insertontime
 } -cleanup {
     destroy .e
-} -result {100}
+} -result 100
 test spinbox-1.50 {configuration option: "insertontime" for spinbox} -setup {
         spinbox .e -borderwidth 2 -highlightthickness 2 -font {Helvetica -12} \
         -relief sunken
@@ -691,7 +691,7 @@ test spinbox-1.59 {configuration option: "repeatdelay"} -setup {
     .e cget -repeatdelay
 } -cleanup {
     destroy .e
-} -result {500}
+} -result 500
 test spinbox-1.60 {configuration option: "repeatdelay" for spinbox} -setup {
         spinbox .e -borderwidth 2 -highlightthickness 2 -font {Helvetica -12} \
         -relief sunken
@@ -757,7 +757,7 @@ test spinbox-1.65 {configuration option: "selectborderwidth"} -setup {
     .e cget -selectborderwidth
 } -cleanup {
     destroy .e
-} -result {1}
+} -result 1
 test spinbox-1.66 {configuration option: "selectborderwidth" for spinbox} -setup {
         spinbox .e -borderwidth 2 -highlightthickness 2 -font {Helvetica -12} \
         -relief sunken
@@ -937,7 +937,7 @@ test spinbox-1.81 {configuration option: "width"} -setup {
     .e cget -width
 } -cleanup {
     destroy .e
-} -result {402}
+} -result 402
 test spinbox-1.82 {configuration option: "width" for spinbox} -setup {
         spinbox .e -borderwidth 2 -highlightthickness 2 -font {Helvetica -12} \
         -relief sunken
@@ -959,7 +959,7 @@ test spinbox-1.83 {configuration option: "wrap"} -setup {
     .e cget -wrap
 } -cleanup {
     destroy .e
-} -result {1}
+} -result 1
 test spinbox-1.84 {configuration option: "wrap" for spinbox} -setup {
         spinbox .e -borderwidth 2 -highlightthickness 2 -font {Helvetica -12} \
         -relief sunken
@@ -1154,7 +1154,7 @@ test spinbox-3.14 {SpinboxWidgetCmd procedure, "cget" widget command} -setup {
     .e cget -bd
 } -cleanup {
     destroy .e
-} -result {4}
+} -result 4
 test spinbox-3.15 {SpinboxWidgetCmd procedure, "configure" widget command} -setup {
     spinbox .e
     pack .e
@@ -1163,7 +1163,7 @@ test spinbox-3.15 {SpinboxWidgetCmd procedure, "configure" widget command} -setu
     llength [.e configure]
 } -cleanup {
     destroy .e
-} -result {51}
+} -result 51
 test spinbox-3.16 {SpinboxWidgetCmd procedure, "configure" widget command} -setup {
     spinbox .e
 } -body {
@@ -1179,7 +1179,7 @@ test spinbox-3.17 {SpinboxWidgetCmd procedure, "configure" widget command} -setu
     lindex [.e configure -bd] 4
 } -cleanup {
     destroy .e
-} -result {4}
+} -result 4
 test spinbox-3.18 {SpinboxWidgetCmd procedure, "delete" widget command} -setup {
     spinbox .e
 } -body {
@@ -1218,7 +1218,7 @@ test spinbox-3.22 {SpinboxWidgetCmd procedure, "delete" widget command} -setup {
     .e get
 } -cleanup {
     destroy .e
-} -result {014567890}
+} -result 014567890
 test spinbox-3.23 {SpinboxWidgetCmd procedure, "delete" widget command} -setup {
     spinbox .e
 } -body {
@@ -1227,7 +1227,7 @@ test spinbox-3.23 {SpinboxWidgetCmd procedure, "delete" widget command} -setup {
     .e get
 } -cleanup {
     destroy .e
-} -result {0123457890}
+} -result 0123457890
 test spinbox-3.24 {SpinboxWidgetCmd procedure, "delete" widget command} -setup {
     spinbox .e
     pack .e
@@ -1259,7 +1259,7 @@ test spinbox-3.25 {SpinboxWidgetCmd procedure, "delete" widget command} -setup {
     .e get
 } -cleanup {
     destroy .e
-} -result {01234567890}
+} -result 01234567890
 test spinbox-3.26 {SpinboxWidgetCmd procedure, "delete" widget command} -setup {
     spinbox .e
     pack .e
@@ -1272,7 +1272,7 @@ test spinbox-3.26 {SpinboxWidgetCmd procedure, "delete" widget command} -setup {
     .e get
 } -cleanup {
     destroy .e
-} -result {01234567890}
+} -result 01234567890
 test spinbox-3.26.1 {SpinboxWidgetCmd procedure, "delete" widget command} -setup {
     spinbox .e
     pack .e
@@ -1285,7 +1285,7 @@ test spinbox-3.26.1 {SpinboxWidgetCmd procedure, "delete" widget command} -setup
     .e get
 } -cleanup {
     destroy .e
-} -result {01234567890}
+} -result 01234567890
 test spinbox-3.27 {SpinboxWidgetCmd procedure, "get" widget command} -setup {
     spinbox .e
 } -body {
@@ -1315,7 +1315,7 @@ test spinbox-3.30 {SpinboxWidgetCmd procedure, "icursor" widget command} -setup
     .e index insert
 } -cleanup {
     destroy .e
-} -result {4}
+} -result 4
 test spinbox-3.31 {SpinboxWidgetCmd procedure, "index" widget command} -setup {
     spinbox .e
 } -body {
@@ -1401,7 +1401,7 @@ test spinbox-3.40 {SpinboxWidgetCmd procedure, "insert" widget command} -setup {
     .e get
 } -cleanup {
     destroy .e
-} -result {01234567890}
+} -result 01234567890
 test spinbox-3.40.1 {SpinboxWidgetCmd procedure, "insert" widget command} -setup {
     spinbox .e
     pack .e
@@ -1414,7 +1414,7 @@ test spinbox-3.40.1 {SpinboxWidgetCmd procedure, "insert" widget command} -setup
     .e get
 } -cleanup {
     destroy .e
-} -result {01234567890}
+} -result 01234567890
 test spinbox-3.41 {SpinboxWidgetCmd procedure, "insert" widget command} -setup {
     spinbox .e
 } -body {
@@ -1474,7 +1474,7 @@ test spinbox-3.46 {SpinboxWidgetCmd procedure, "scan" widget command} -constrain
     .e index @0
 } -cleanup {
     destroy .e
-} -result {2}
+} -result 2
 test spinbox-3.47 {SpinboxWidgetCmd procedure, "select" widget command} -setup {
     spinbox .e
 } -body {
@@ -1543,7 +1543,7 @@ test spinbox-3.52 {SpinboxWidgetCmd procedure, "selection present" widget comman
     .e selection present
 } -cleanup {
     destroy .e
-} -result {1}
+} -result 1
 test spinbox-3.53 {SpinboxWidgetCmd procedure, "selection present" widget command} -setup {
     spinbox .e
     pack .e
@@ -1556,7 +1556,7 @@ test spinbox-3.53 {SpinboxWidgetCmd procedure, "selection present" widget comman
     .e selection present
 } -cleanup {
     destroy .e
-} -result {1}
+} -result 1
 test spinbox-3.54 {SpinboxWidgetCmd procedure, "selection present" widget command} -setup {
     spinbox .e
     pack .e
@@ -1569,7 +1569,7 @@ test spinbox-3.54 {SpinboxWidgetCmd procedure, "selection present" widget comman
     .e selection present
 } -cleanup {
     destroy .e
-} -result {0}
+} -result 0
 test spinbox-3.55 {SpinboxWidgetCmd procedure, "selection adjust" widget command} -setup {
     spinbox .e
 } -body {
@@ -1597,7 +1597,7 @@ test spinbox-3.57 {SpinboxWidgetCmd procedure, "selection adjust" widget command
     selection get
 } -cleanup {
     destroy .e
-} -result {123}
+} -result 123
 test spinbox-3.58 {SpinboxWidgetCmd procedure, "selection adjust" widget command} -setup {
     spinbox .e
     pack .e
@@ -1611,7 +1611,7 @@ test spinbox-3.58 {SpinboxWidgetCmd procedure, "selection adjust" widget command
     selection get
 } -cleanup {
     destroy .e
-} -result {234}
+} -result 234
 test spinbox-3.59 {SpinboxWidgetCmd procedure, "selection from" widget command} -setup {
     spinbox .e
 } -body {
@@ -1825,7 +1825,7 @@ test spinbox-3.75 {SpinboxWidgetCmd procedure, "xview" widget command} -setup {
     .e index @0
 } -cleanup {
     destroy .e
-} -result {32}
+} -result 32
 test spinbox-3.76 {SpinboxWidgetCmd procedure, "xview" widget command} -setup {
     spinbox .e -font {Courier -12} -borderwidth 2 -highlightthickness 2
     pack .e
@@ -1839,7 +1839,7 @@ test spinbox-3.76 {SpinboxWidgetCmd procedure, "xview" widget command} -setup {
     .e index @0
 } -cleanup {
     destroy .e
-} -result {29}
+} -result 29
 test spinbox-3.77 {SpinboxWidgetCmd procedure, "xview" widget command} -setup {
     spinbox .e -font {Courier -12} -borderwidth 2 -highlightthickness 2
     pack .e
@@ -1875,7 +1875,7 @@ test spinbox-3.79 {SpinboxWidgetCmd procedure, "xview" widget command} -setup {
     .e index @0
 } -cleanup {
     destroy .e
-} -result {0}
+} -result 0
 test spinbox-3.80 {SpinboxWidgetCmd procedure, "xview" widget command} -setup {
     spinbox .e -font {Courier -12} -borderwidth 2 -highlightthickness 2
     pack .e
@@ -1887,7 +1887,7 @@ test spinbox-3.80 {SpinboxWidgetCmd procedure, "xview" widget command} -setup {
     .e index @0
 } -cleanup {
     destroy .e
-} -result {73}
+} -result 73
 test spinbox-3.81 {SpinboxWidgetCmd procedure, "xview" widget command} -setup {
     spinbox .e -font {Courier -12} -borderwidth 2 -highlightthickness 2
     pack .e
@@ -1926,7 +1926,7 @@ test spinbox-5.1 {ConfigureSpinbox procedure, -textvariable} -body {
     .e get
 } -cleanup {
     destroy .e
-} -result {12345}
+} -result 12345
 test spinbox-5.2 {ConfigureSpinbox procedure, -textvariable} -body {
     set x 12345
     spinbox .e -textvariable x
@@ -2144,7 +2144,7 @@ test spinbox-6.4 {SpinboxComputeGeometry procedure} -setup {
     .e index @0
 } -cleanup {
     destroy .e
-} -result {6}
+} -result 6
 test spinbox-6.5 {SpinboxComputeGeometry procedure} -setup {
     spinbox .e -highlightthickness 2
     pack .e
@@ -2156,7 +2156,7 @@ test spinbox-6.5 {SpinboxComputeGeometry procedure} -setup {
     .e index @0
 } -cleanup {
     destroy .e
-} -result {6}
+} -result 6
 test spinbox-6.6 {SpinboxComputeGeometry procedure} -constraints {
     fonts
 } -setup {
@@ -2311,7 +2311,7 @@ test spinbox-7.7 {InsertChars procedure} -setup {
     .e index insert
 } -cleanup {
     destroy .e
-} -result {7}
+} -result 7
 test spinbox-7.8 {InsertChars procedure} -setup {
     spinbox .e -width 10 -font {Courier -12} -highlightthickness 2 -bd 2
     pack .e
@@ -2322,7 +2322,7 @@ test spinbox-7.8 {InsertChars procedure} -setup {
     .e index insert
 } -cleanup {
     destroy .e
-} -result {4}
+} -result 4
 test spinbox-7.9 {InsertChars procedure} -setup {
     spinbox .e -width 10 -font {Courier -12} -highlightthickness 2 -bd 2
     pack .e
@@ -2334,7 +2334,7 @@ test spinbox-7.9 {InsertChars procedure} -setup {
     .e index @0
 } -cleanup {
     destroy .e
-} -result {7}
+} -result 7
 test spinbox-7.10 {InsertChars procedure} -setup {
     spinbox .e -width 10 -font {Courier -12} -highlightthickness 2 -bd 2
     pack .e
@@ -2346,7 +2346,7 @@ test spinbox-7.10 {InsertChars procedure} -setup {
     .e index @0
 } -cleanup {
     destroy .e
-} -result {4}
+} -result 4
 
 test spinbox-7.11 {InsertChars procedure} -constraints {
     fonts
@@ -2360,7 +2360,7 @@ test spinbox-7.11 {InsertChars procedure} -constraints {
     winfo reqwidth .e
 } -cleanup {
     destroy .e
-} -result {70}
+} -result 70
 
 test spinbox-8.1 {DeleteChars procedure} -setup {
     unset -nocomplain contents
@@ -2545,7 +2545,7 @@ test spinbox-8.12 {DeleteChars procedure} -setup {
     .e index insert
 } -cleanup {
     destroy .e
-} -result {1}
+} -result 1
 test spinbox-8.13 {DeleteChars procedure} -setup {
     spinbox .e -width 10 -font {Courier -12} -highlightthickness 2 -bd 2
     pack .e
@@ -2558,7 +2558,7 @@ test spinbox-8.13 {DeleteChars procedure} -setup {
     .e index insert
 } -cleanup {
     destroy .e
-} -result {1}
+} -result 1
 test spinbox-8.14 {DeleteChars procedure} -setup {
     spinbox .e -width 10 -font {Courier -12} -highlightthickness 2 -bd 2
     pack .e
@@ -2571,7 +2571,7 @@ test spinbox-8.14 {DeleteChars procedure} -setup {
     .e index insert
 } -cleanup {
     destroy .e
-} -result {4}
+} -result 4
 test spinbox-8.15 {DeleteChars procedure} -setup {
     spinbox .e -width 10 -font {Courier -12} -highlightthickness 2 -bd 2
     pack .e
@@ -2584,7 +2584,7 @@ test spinbox-8.15 {DeleteChars procedure} -setup {
     .e index @0
 } -cleanup {
     destroy .e
-} -result {1}
+} -result 1
 test spinbox-8.16 {DeleteChars procedure} -setup {
     spinbox .e -width 10 -font {Courier -12} -highlightthickness 2 -bd 2
     pack .e
@@ -2597,7 +2597,7 @@ test spinbox-8.16 {DeleteChars procedure} -setup {
     .e index @0
 } -cleanup {
     destroy .e
-} -result {1}
+} -result 1
 test spinbox-8.17 {DeleteChars procedure} -setup {
     spinbox .e -width 10 -font {Courier -12} -highlightthickness 2 -bd 2
     pack .e
@@ -2610,7 +2610,7 @@ test spinbox-8.17 {DeleteChars procedure} -setup {
     .e index @0
 } -cleanup {
     destroy .e
-} -result {4}
+} -result 4
 test spinbox-8.18 {DeleteChars procedure} -setup {
     spinbox .e -width 0 -font {Courier -12} -highlightthickness 2 -bd 2
     pack .e
@@ -2637,7 +2637,7 @@ test spinbox-8.18 {DeleteChars procedure} -setup {
 } -cleanup {
     destroy .e
     unset XPAD buttonWidth expected
-} -result {1}
+} -result 1
 
 test spinbox-9.1 {SpinboxValueChanged procedure} -setup {
     unset -nocomplain x
@@ -2717,7 +2717,7 @@ test spinbox-10.5 {SpinboxSetValue procedure, updating display position} -setup
     .e index @0
 } -cleanup {
     destroy .e
-} -result {0}
+} -result 0
 test spinbox-10.6 {SpinboxSetValue procedure, updating display position} -setup {
     unset -nocomplain x
     spinbox .e -highlightthickness 2 -bd 2
@@ -2733,7 +2733,7 @@ test spinbox-10.6 {SpinboxSetValue procedure, updating display position} -setup
     .e index @0
 } -cleanup {
     destroy .e
-} -result {10}
+} -result 10
 test spinbox-10.7 {SpinboxSetValue procedure, updating insertion cursor} -setup {
     unset -nocomplain x
     spinbox .e -highlightthickness 2 -bd 2
@@ -2748,7 +2748,7 @@ test spinbox-10.7 {SpinboxSetValue procedure, updating insertion cursor} -setup
     .e index insert
 } -cleanup {
     destroy .e
-} -result {3}
+} -result 3
 test spinbox-10.8 {SpinboxSetValue procedure, updating insertion cursor} -setup {
     unset -nocomplain x
     spinbox .e -highlightthickness 2 -bd 2
@@ -2762,7 +2762,7 @@ test spinbox-10.8 {SpinboxSetValue procedure, updating insertion cursor} -setup
     .e index insert
 } -cleanup {
     destroy .e
-} -result {5}
+} -result 5
 
 test spinbox-11.1 {SpinboxEventProc procedure} -setup {
     spinbox .e -highlightthickness 2 -bd 2 -font {Helvetica -12}
@@ -2806,7 +2806,7 @@ test spinbox-13.1 {GetSpinboxIndex procedure} -setup {
     .e index end
 } -cleanup {
     destroy .e
-} -result {21}
+} -result 21
 test spinbox-13.2 {GetSpinboxIndex procedure} -body {
     spinbox .e
     .e index abogus
@@ -2825,7 +2825,7 @@ test spinbox-13.3 {GetSpinboxIndex procedure} -setup {
     .e index anchor
 } -cleanup {
     destroy .e
-} -result {1}
+} -result 1
 test spinbox-13.4 {GetSpinboxIndex procedure} -setup {
     spinbox .e -font {Courier -12} -width 5 -bd 2 -relief sunken
     pack .e
@@ -2838,7 +2838,7 @@ test spinbox-13.4 {GetSpinboxIndex procedure} -setup {
     .e index anchor
 } -cleanup {
     destroy .e
-} -result {4}
+} -result 4
 test spinbox-13.5 {GetSpinboxIndex procedure} -setup {
     spinbox .e -font {Courier -12} -width 5 -bd 2 -relief sunken
     pack .e
@@ -2852,7 +2852,7 @@ test spinbox-13.5 {GetSpinboxIndex procedure} -setup {
     .e index anchor
 } -cleanup {
     destroy .e
-} -result {15}
+} -result 15
 test spinbox-13.6 {GetSpinboxIndex procedure} -setup {
     spinbox .e
 } -body {
@@ -2871,7 +2871,7 @@ test spinbox-13.7 {GetSpinboxIndex procedure} -setup {
     .e index insert
 } -cleanup {
     destroy .e
-} -result {2}
+} -result 2
 test spinbox-13.8 {GetSpinboxIndex procedure} -setup {
     spinbox .e
 } -body {
@@ -2931,7 +2931,7 @@ test spinbox-13.11 {GetSpinboxIndex procedure} -constraints aquaOrWin32 -body {
     .e index sel.first
 } -cleanup {
     destroy .e
-} -result {1}
+} -result 1
 
 test spinbox-13.12 {GetSpinboxIndex procedure} -constraints x11 -body {
 # Previous settings:
@@ -3043,7 +3043,7 @@ test spinbox-13.16 {GetSpinboxIndex procedure} -constraints fonts -body {
     .e index @4
 } -cleanup {
     destroy .e
-} -result {4}
+} -result 4
 test spinbox-13.17 {GetSpinboxIndex procedure} -constraints fonts -body {
     spinbox .e -width 5 -relief sunken -highlightthickness 2 -bd 2 \
         -font {Courier -12}
@@ -3054,7 +3054,7 @@ test spinbox-13.17 {GetSpinboxIndex procedure} -constraints fonts -body {
     .e index @11
 } -cleanup {
     destroy .e
-} -result {4}
+} -result 4
 test spinbox-13.18 {GetSpinboxIndex procedure} -constraints fonts -body {
     spinbox .e -width 5 -relief sunken -highlightthickness 2 -bd 2 \
         -font {Courier -12}
@@ -3065,7 +3065,7 @@ test spinbox-13.18 {GetSpinboxIndex procedure} -constraints fonts -body {
     .e index @12
 } -cleanup {
     destroy .e
-} -result {5}
+} -result 5
 test spinbox-13.19 {GetSpinboxIndex procedure} -constraints fonts -body {
     spinbox .e -width 5 -relief sunken -highlightthickness 2 -bd 2 \
         -font {Courier -12}
@@ -3076,7 +3076,7 @@ test spinbox-13.19 {GetSpinboxIndex procedure} -constraints fonts -body {
     .e index @[expr {[winfo width .e] - 6-11}]
 } -cleanup {
     destroy .e
-} -result {8}
+} -result 8
 test spinbox-13.20 {GetSpinboxIndex procedure} -constraints fonts -body {
     spinbox .e -width 5 -relief sunken -highlightthickness 2 -bd 2 \
         -font {Courier -12}
@@ -3087,7 +3087,7 @@ test spinbox-13.20 {GetSpinboxIndex procedure} -constraints fonts -body {
     .e index @[expr {[winfo width .e] - 5}]
 } -cleanup {
     destroy .e
-} -result {9}
+} -result 9
 test spinbox-13.21 {GetSpinboxIndex procedure} -body {
     spinbox .e -width 5 -relief sunken -highlightthickness 2 -bd 2 \
         -font {Courier -12}
@@ -3098,7 +3098,7 @@ test spinbox-13.21 {GetSpinboxIndex procedure} -body {
     .e index @1000
 } -cleanup {
     destroy .e
-} -result {9}
+} -result 9
 test spinbox-13.22 {GetSpinboxIndex procedure} -setup {
     spinbox .e
     pack .e
@@ -3118,7 +3118,7 @@ test spinbox-13.23 {GetSpinboxIndex procedure} -body {
     .e index -10
 } -cleanup {
     destroy .e
-} -result {0}
+} -result 0
 test spinbox-13.24 {GetSpinboxIndex procedure} -body {
     spinbox .e -width 5 -relief sunken -highlightthickness 2 -bd 2 \
         -font {Courier -12}
@@ -3129,7 +3129,7 @@ test spinbox-13.24 {GetSpinboxIndex procedure} -body {
     .e index 12
 } -cleanup {
     destroy .e
-} -result {12}
+} -result 12
 test spinbox-13.25 {GetSpinboxIndex procedure} -body {
     spinbox .e -width 5 -relief sunken -highlightthickness 2 -bd 2 \
         -font {Courier -12}
@@ -3140,7 +3140,7 @@ test spinbox-13.25 {GetSpinboxIndex procedure} -body {
     .e index 49
 } -cleanup {
     destroy .e
-} -result {21}
+} -result 21
 
 # XXX Still need to write tests for SpinboxScanTo and SpinboxSelectTo.
 
@@ -3166,7 +3166,7 @@ test spinbox-14.3 {SpinboxFetchSelection procedure} -setup {
     string compare [selection get] $x
 } -cleanup {
     destroy .e
-} -result {0}
+} -result 0
 
 test spinbox-15.1 {SpinboxLostSelection} -body {
     spinbox .e
@@ -3264,7 +3264,7 @@ test spinbox-18.1 {Spinbox widget vs hiding} -setup {
     set res1 [list [winfo children .] [interp hidden]]
     set res2 [list {} $l]
     expr {$res1 == $res2}
-} -result {1}
+} -result 1
 
 ##
 ## Spinbox widget VALIDATION tests
@@ -3805,7 +3805,7 @@ test spinbox-22.1 {spinbox config, -from changes SF bug 559078} -body {
     set val
 } -cleanup {
     destroy .e
-} -result {5}
+} -result 5
 test spinbox-22.2 {spinbox config, -from changes SF bug 559078} -body {
     set val 5
     spinbox .e -from 1 -to 10 -textvariable val
@@ -3813,7 +3813,7 @@ test spinbox-22.2 {spinbox config, -from changes SF bug 559078} -body {
     set val
 } -cleanup {
     destroy .e
-} -result {5}
+} -result 5
 test spinbox-22.3 {spinbox config, -from changes SF bug 559078} -body {
     set val 5
     spinbox .e -from 3 -to 10 -textvariable val
@@ -3821,7 +3821,7 @@ test spinbox-22.3 {spinbox config, -from changes SF bug 559078} -body {
     set val
 } -cleanup {
     destroy .e
-} -result {6}
+} -result 6
 
 test spinbox-23.1 {selection present while disabled, bug 637828} -body {
     spinbox .e
diff --git a/tests/text.test b/tests/text.test
index 7770084..a810387 100644
--- a/tests/text.test
+++ b/tests/text.test
@@ -28,7 +28,7 @@ test text-1.1 {configuration option: "autoseparators"} -setup {
     .t cget -autoseparators
 } -cleanup {
     destroy .t
-} -result {1}
+} -result 1
 test text-1.1b {configuration option: "autoseparators", default} -setup {
     text .t -borderwidth 2 -highlightthickness 2 -font {Courier -12 bold}
     pack .t
@@ -37,7 +37,7 @@ test text-1.1b {configuration option: "autoseparators", default} -setup {
     .t cget -autoseparators
 } -cleanup {
     destroy .t
-} -result {1}
+} -result 1
 test text-1.2 {configuration option: "autoseparators"} -setup {
     text .t -borderwidth 2 -highlightthickness 2 -font {Courier -12 bold}
     pack .t
@@ -75,7 +75,7 @@ test text-1.5 {configuration option: "bd"} -setup {
     .t cget -bd
 } -cleanup {
     destroy .t
-} -result {4}
+} -result 4
 test text-1.6 {configuration option: "bd"} -setup {
     text .t -borderwidth 2 -highlightthickness 2 -font {Courier -12 bold}
     pack .t
@@ -113,7 +113,7 @@ test text-1.9 {configuration option: "blockcursor"} -setup {
     .t cget -blockcursor
 } -cleanup {
     destroy .t
-} -result {0}
+} -result 0
 test text-1.10 {configuration option: "blockcursor"} -setup {
     text .t -borderwidth 2 -highlightthickness 2 -font {Courier -12 bold}
     pack .t
@@ -132,7 +132,7 @@ test text-1.11 {configuration option: "borderwidth"} -setup {
     .t cget -borderwidth
 } -cleanup {
     destroy .t
-} -result {7}
+} -result 7
 test text-1.12 {configuration option: "borderwidth"} -setup {
     text .t -borderwidth 2 -highlightthickness 2 -font {Courier -12 bold}
     pack .t
@@ -170,7 +170,7 @@ test text-1.15 {configuration option: "exportselection"} -setup {
     .t cget -exportselection
 } -cleanup {
     destroy .t
-} -result {0}
+} -result 0
 test text-1.16 {configuration option: "exportselection"} -setup {
     text .t -borderwidth 2 -highlightthickness 2 -font {Courier -12 bold}
     pack .t
@@ -246,7 +246,7 @@ test text-1.23 {configuration option: "height"} -setup {
     .t cget -height
 } -cleanup {
     destroy .t
-} -result {5}
+} -result 5
 test text-1.24 {configuration option: "height"} -setup {
     text .t -borderwidth 2 -highlightthickness 2 -font {Courier -12 bold}
     pack .t
@@ -303,7 +303,7 @@ test text-1.29 {configuration option: "highlightthickness"} -setup {
     .t cget -highlightthickness
 } -cleanup {
     destroy .t
-} -result {0}
+} -result 0
 test text-1.30 {configuration option: "highlightthickness"} -setup {
     text .t -borderwidth 2 -highlightthickness 2 -font {Courier -12 bold}
     pack .t
@@ -360,7 +360,7 @@ test text-1.35 {configuration option: "insertborderwidth"} -setup {
     .t cget -insertborderwidth
 } -cleanup {
     destroy .t
-} -result {45}
+} -result 45
 test text-1.36 {configuration option: "insertborderwidth"} -setup {
     text .t -borderwidth 2 -highlightthickness 2 -font {Courier -12 bold}
     pack .t
@@ -379,7 +379,7 @@ test text-1.37 {configuration option: "insertofftime"} -setup {
     .t cget -insertofftime
 } -cleanup {
     destroy .t
-} -result {100}
+} -result 100
 test text-1.38 {configuration option: "insertofftime"} -setup {
     text .t -borderwidth 2 -highlightthickness 2 -font {Courier -12 bold}
     pack .t
@@ -398,7 +398,7 @@ test text-1.39 {configuration option: "insertontime"} -setup {
     .t cget -insertontime
 } -cleanup {
     destroy .t
-} -result {47}
+} -result 47
 test text-1.40 {configuration option: "insertontime"} -setup {
     text .t -borderwidth 2 -highlightthickness 2 -font {Courier -12 bold}
     pack .t
@@ -417,7 +417,7 @@ test text-1.41 {configuration option: "insertwidth"} -setup {
     .t cget -insertwidth
 } -cleanup {
     destroy .t
-} -result {2}
+} -result 2
 test text-1.42 {configuration option: "insertwidth"} -setup {
     text .t -borderwidth 2 -highlightthickness 2 -font {Courier -12 bold}
     pack .t
@@ -436,7 +436,7 @@ test text-1.43 {configuration option: "maxundo"} -setup {
     .t cget -maxundo
 } -cleanup {
     destroy .t
-} -result {5}
+} -result 5
 test text-1.43b {configuration option: "maxundo", default} -setup {
     text .t -borderwidth 2 -highlightthickness 2 -font {Courier -12 bold}
     pack .t
@@ -445,7 +445,7 @@ test text-1.43b {configuration option: "maxundo", default} -setup {
     .t cget -maxundo
 } -cleanup {
     destroy .t
-} -result {0}
+} -result 0
 test text-1.44 {configuration option: "maxundo"} -setup {
     text .t -borderwidth 2 -highlightthickness 2 -font {Courier -12 bold}
     pack .t
@@ -464,7 +464,7 @@ test text-1.45 {configuration option: "padx"} -setup {
     .t cget -padx
 } -cleanup {
     destroy .t
-} -result {3}
+} -result 3
 test text-1.46 {configuration option: "padx"} -setup {
     text .t -borderwidth 2 -highlightthickness 2 -font {Courier -12 bold}
     pack .t
@@ -483,7 +483,7 @@ test text-1.47 {configuration option: "pady"} -setup {
     .t cget -pady
 } -cleanup {
     destroy .t
-} -result {82}
+} -result 82
 test text-1.48 {configuration option: "pady"} -setup {
     text .t -borderwidth 2 -highlightthickness 2 -font {Courier -12 bold}
     pack .t
@@ -540,7 +540,7 @@ test text-1.53 {configuration option: "selectborderwidth"} -setup {
     .t cget -selectborderwidth
 } -cleanup {
     destroy .t
-} -result {21}
+} -result 21
 test text-1.54 {configuration option: "selectborderwidth"} -setup {
     text .t -borderwidth 2 -highlightthickness 2 -font {Courier -12 bold}
     pack .t
@@ -578,7 +578,7 @@ test text-1.57 {configuration option: "spacing1"} -setup {
     .t cget -spacing1
 } -cleanup {
     destroy .t
-} -result {20}
+} -result 20
 test text-1.58 {configuration option: "spacing1"} -setup {
     text .t -borderwidth 2 -highlightthickness 2 -font {Courier -12 bold}
     pack .t
@@ -597,7 +597,7 @@ test text-1.59 {configuration option: "spacing1"} -setup {
     .t cget -spacing1
 } -cleanup {
     destroy .t
-} -result {0}
+} -result 0
 test text-1.60 {configuration option: "spacing1"} -setup {
     text .t -borderwidth 2 -highlightthickness 2 -font {Courier -12 bold}
     pack .t
@@ -616,7 +616,7 @@ test text-1.61 {configuration option: "spacing2"} -setup {
     .t cget -spacing2
 } -cleanup {
     destroy .t
-} -result {5}
+} -result 5
 test text-1.62 {configuration option: "spacing2"} -setup {
     text .t -borderwidth 2 -highlightthickness 2 -font {Courier -12 bold}
     pack .t
@@ -635,7 +635,7 @@ test text-1.63 {configuration option: "spacing2"} -setup {
     .t cget -spacing2
 } -cleanup {
     destroy .t
-} -result {0}
+} -result 0
 test text-1.64 {configuration option: "spacing2"} -setup {
     text .t -borderwidth 2 -highlightthickness 2 -font {Courier -12 bold}
     pack .t
@@ -654,7 +654,7 @@ test text-1.65 {configuration option: "spacing3"} -setup {
     .t cget -spacing3
 } -cleanup {
     destroy .t
-} -result {20}
+} -result 20
 test text-1.66 {configuration option: "spacing3"} -setup {
     text .t -borderwidth 2 -highlightthickness 2 -font {Courier -12 bold}
     pack .t
@@ -673,7 +673,7 @@ test text-1.67 {configuration option: "spacing3"} -setup {
     .t cget -spacing3
 } -cleanup {
     destroy .t
-} -result {0}
+} -result 0
 test text-1.68 {configuration option: "spacing3"} -setup {
     text .t -borderwidth 2 -highlightthickness 2 -font {Courier -12 bold}
     pack .t
@@ -749,7 +749,7 @@ test text-1.75 {configuration option: "undo"} -setup {
     .t cget -undo
 } -cleanup {
     destroy .t
-} -result {1}
+} -result 1
 test text-1.75b {configuration option: "undo", default} -setup {
     text .t -borderwidth 2 -highlightthickness 2 -font {Courier -12 bold}
     pack .t
@@ -758,7 +758,7 @@ test text-1.75b {configuration option: "undo", default} -setup {
     .t cget -undo
 } -cleanup {
     destroy .t
-} -result {0}
+} -result 0
 test text-1.76 {configuration option: "undo"} -setup {
     text .t -borderwidth 2 -highlightthickness 2 -font {Courier -12 bold}
     pack .t
@@ -777,7 +777,7 @@ test text-1.77 {configuration option: "width"} -setup {
     .t cget -width
 } -cleanup {
     destroy .t
-} -result {73}
+} -result 73
 test text-1.78 {configuration option: "width"} -setup {
     text .t -borderwidth 2 -highlightthickness 2 -font {Courier -12 bold}
     pack .t
@@ -1004,7 +1004,7 @@ test text-5.4 {TextWidgetCmd procedure, "cget" option} -setup {
     .t cget -bd
 } -cleanup {
     destroy .t
-} -result {17}
+} -result 17
 
 
 test text-6.1 {TextWidgetCmd procedure, "compare" option} -setup {
@@ -1198,7 +1198,7 @@ test text-7.3 {TextWidgetCmd procedure, "debug" option} -setup {
     .t deb
 } -cleanup {
     destroy .t
-} -result {1}
+} -result 1
 test text-7.4 {TextWidgetCmd procedure, "debug" option} -setup {
     text .t
 } -body {
@@ -1206,7 +1206,7 @@ test text-7.4 {TextWidgetCmd procedure, "debug" option} -setup {
     .t debug
 } -cleanup {
     destroy .t
-} -result {0}
+} -result 0
 
 
 test text-8.1 {TextWidgetCmd procedure, "delete" option} -setup {
@@ -1458,7 +1458,7 @@ Line 7"
     string equal [.t get 1.0 end-1c] $prevtext
 } -cleanup {
     destroy .t
-} -result {1}
+} -result 1
 test text-8.22 {TextWidgetCmd procedure, "replace" option with undo} -setup {
     text .t
     set res {}
@@ -1521,7 +1521,7 @@ Line 7"
     string equal [.t get 1.0 end-1c] $prevtext
 } -cleanup {
     destroy .t
-} -result {1}
+} -result 1
 test text-8.24 {TextWidgetCmd procedure, "replace" option with peers, undo} -setup {
     text .t
 } -body {
@@ -1548,7 +1548,7 @@ Line 7"
     string equal [.t get 1.0 end-1c] $prevtext
 } -cleanup {
     destroy .t
-} -result {1}
+} -result 1
 test text-8.25 {TextWidgetCmd procedure, "replace" option with peers, undo} -setup {
     text .t
 } -body {
@@ -2117,7 +2117,7 @@ Line 7"
     .t count 5.3 5.5
 } -cleanup {
     destroy .t
-} -result {2}
+} -result 2
 test text-10.8 {TextWidgetCmd procedure, "count" option} -setup {
     text .t
 } -body {
@@ -2131,7 +2131,7 @@ Line 7"
     .t count 5.3 end
 } -cleanup {
     destroy .t
-} -result {29}
+} -result 29
 test text-10.9 {TextWidgetCmd procedure, "count" option} -setup {
     text .t
     .t insert 1.0 "Line 1
@@ -2145,7 +2145,7 @@ Line 7"
     .t count 5.2 5.7
 } -cleanup {
     destroy .t
-} -result {5}
+} -result 5
 test text-10.10 {TextWidgetCmd procedure, "count" option} -setup {
     text .t
     .t insert 1.0 "Line 1
@@ -2159,7 +2159,7 @@ Line 7"
     .t count 5.2 5.3
 } -cleanup {
     destroy .t
-} -result {1}
+} -result 1
 test text-10.11 {TextWidgetCmd procedure, "count" option} -setup {
     text .t
     .t insert 1.0 "Line 1
@@ -2173,7 +2173,7 @@ Line 7"
     .t count 5.2 5.4
 } -cleanup {
     destroy .t
-} -result {2}
+} -result 2
 test text-10.12 {TextWidgetCmd procedure, "count" option} -setup {
     text .t
     .t insert 1.0 "Line 1
@@ -2203,7 +2203,7 @@ Line 7"
     .t count -displayindices 2.0 3.0
 } -cleanup {
     destroy .t
-} -result {2}
+} -result 2
 test text-10.14 {TextWidgetCmd procedure, "count" option} -setup {
     text .t
 } -body {
@@ -2219,7 +2219,7 @@ Line 7"
     .t count -displayindices 2.2 3.0
 } -cleanup {
     destroy .t
-} -result {0}
+} -result 0
 test text-10.15 {TextWidgetCmd procedure, "count" option} -setup {
     text .t
 } -body {
@@ -2236,7 +2236,7 @@ Line 7"
     .t count -displayindices 2.0 4.2
 } -cleanup {
     destroy .t
-} -result {5}
+} -result 5
 test text-10.16 {TextWidgetCmd procedure, "count" option} -setup {
     text .t
 } -body {
@@ -2259,7 +2259,7 @@ Line 7"
     .t count -displayindices 2.0 3.0
 } -cleanup {
     destroy .t
-} -result {3}
+} -result 3
 test text-10.17 {TextWidgetCmd procedure, "count" option} -setup {
     text .t
 } -body {
@@ -2282,7 +2282,7 @@ Line 7"
     .t count -displayindices 2.2 3.0
 } -cleanup {
     destroy .t
-} -result {1}
+} -result 1
 test text-10.18 {TextWidgetCmd procedure, "count" option} -setup {
     text .t
 } -body {
@@ -2307,7 +2307,7 @@ Line 7"
     .t count -displayindices a 3.0
 } -cleanup {
     destroy .t
-} -result {0}
+} -result 0
 test text-10.19 {TextWidgetCmd procedure, "count" option} -setup {
     text .t
 } -body {
@@ -2331,7 +2331,7 @@ Line 7"
     .t count -displayindices 2.0 4.2
 } -cleanup {
     destroy .t
-} -result {6}
+} -result 6
 test text-10.20 {TextWidgetCmd procedure, "count" option} -setup {
     text .t
 } -body {
@@ -2355,7 +2355,7 @@ Line 7"
     .t count -displaychars 2.0 3.0
 } -cleanup {
     destroy .t
-} -result {2}
+} -result 2
 test text-10.21 {TextWidgetCmd procedure, "count" option} -setup {
     text .t
 } -body {
@@ -2379,7 +2379,7 @@ Line 7"
     .t count -displaychars 2.2 3.0
 } -cleanup {
     destroy .t
-} -result {1}
+} -result 1
 test text-10.22 {TextWidgetCmd procedure, "count" option} -setup {
     text .t
 } -body {
@@ -2404,7 +2404,7 @@ Line 7"
     .t count -displaychars a 3.0
 } -cleanup {
     destroy .t
-} -result {0}
+} -result 0
 test text-10.23 {TextWidgetCmd procedure, "count" option} -setup {
     text .t
 } -body {
@@ -2428,7 +2428,7 @@ Line 7"
     .t count -displaychars 2.0 4.2
 } -cleanup {
     destroy .t
-} -result {5}
+} -result 5
 test text-10.24 {TextWidgetCmd procedure, "count" option} -setup {
     text .t
 } -body {
@@ -2503,7 +2503,7 @@ Line 7"
     .t count -indices 2.0 4.2
 } -cleanup {
     destroy .t
-} -result {21}
+} -result 21
 test text-10.27 {TextWidgetCmd procedure, "count" option} -setup {
     text .t
 } -body {
@@ -2528,7 +2528,7 @@ Line 7"
     .t count -chars 2.2 3.0
 } -cleanup {
     destroy .t
-} -result {10}
+} -result 10
 test text-10.28 {TextWidgetCmd procedure, "count" option} -setup {
     text .t
 } -body {
@@ -2553,7 +2553,7 @@ Line 7"
     .t count -chars a 3.0
 } -cleanup {
     destroy .t
-} -result {9}
+} -result 9
 test text-10.29 {TextWidgetCmd procedure, "count" option} -setup {
     text .t
 } -body {
@@ -2578,7 +2578,7 @@ Line 7"
     .t count -chars 2.0 4.2
 } -cleanup {
     destroy .t
-} -result {19}
+} -result 19
 test text-10.30 {TextWidgetCmd procedure, "count" option} -setup {
     text .t
 } -body {
@@ -2588,7 +2588,7 @@ test text-10.30 {TextWidgetCmd procedure, "count" option} -setup {
     .t count -lines 1.0 end
 } -cleanup {
     destroy .t
-} -result {3}
+} -result 3
 test text-10.31 {TextWidgetCmd procedure, "count" option} -setup {
     text .t
 } -body {
@@ -2618,7 +2618,7 @@ test text-10.33 {TextWidgetCmd procedure, "count" option} -setup {
     .t count -lines end end
 } -cleanup {
     destroy .t
-} -result {0}
+} -result 0
 test text-10.34 {TextWidgetCmd procedure, "count" option} -setup {
     text .t
 } -body {
@@ -2628,7 +2628,7 @@ test text-10.34 {TextWidgetCmd procedure, "count" option} -setup {
     .t count -lines 1.5 2.5
 } -cleanup {
     destroy .t
-} -result {1}
+} -result 1
 test text-10.35 {TextWidgetCmd procedure, "count" option} -setup {
     text .t
 } -body {
@@ -2638,7 +2638,7 @@ test text-10.35 {TextWidgetCmd procedure, "count" option} -setup {
     .t count -lines 2.5 "2.5 lineend"
 } -cleanup {
     destroy .t
-} -result {0}
+} -result 0
 test text-10.36 {TextWidgetCmd procedure, "count" option} -setup {
     text .t
 } -body {
@@ -2659,7 +2659,7 @@ test text-10.37 {TextWidgetCmd procedure, "count" option} -setup {
     .t count -displaylines 1.0 end
 } -cleanup {
     destroy .t
-} -result {3}
+} -result 3
 test text-10.38 {TextWidgetCmd procedure, "count" option} -setup {
     text .t -font {Courier -12} -borderwidth 2 -highlightthickness 2
     pack .t -expand 1 -fill both
@@ -2706,7 +2706,7 @@ test text-9.2.45 {TextWidgetCmd procedure, "count" option} -setup {
     set res [.t count -displaylines 2.0 3.0]
 } -cleanup {
     destroy .t
-} -result {0}
+} -result 0
 test text-9.2.46 {TextWidgetCmd procedure, "count" option} -setup {
     toplevel .mytop
     pack [text .mytop.t -font TkFixedFont -bd 0 -padx 0 -wrap char]
@@ -2783,7 +2783,7 @@ test text-11.2 {counting with tag priority eliding} -setup {
     .t count -displaychars 1.0 1.5
 } -cleanup {
     destroy .t
-} -result {5}
+} -result 5
 test text-11.3 {counting with tag priority eliding} -setup {
     text .t -font {Courier -12} -borderwidth 2 -highlightthickness 2
 } -body {
@@ -2796,7 +2796,7 @@ test text-11.3 {counting with tag priority eliding} -setup {
     .t count -displaychars 1.0 1.5
 } -cleanup {
     destroy .t
-} -result {3}
+} -result 3
 test text-11.4 {counting with tag priority eliding}  -setup {
     text .t -font {Courier -12} -borderwidth 2 -highlightthickness 2
     set res {}
@@ -3426,7 +3426,7 @@ test text-14.14 {ConfigureText procedure} -body {
     selection get
 } -cleanup {
     destroy .t .t2
-} -result {1234}
+} -result 1234
 test text-14.15 {ConfigureText procedure} -body {
     text .t
     entry .t.e
@@ -3440,7 +3440,7 @@ test text-14.15 {ConfigureText procedure} -body {
     selection get
 } -cleanup {
     destroy .t2 .t
-} -result {1234}
+} -result 1234
 test text-14.16 {ConfigureText procedure} -body {
     text .t
     entry .t.e
@@ -3469,7 +3469,7 @@ test text-14.17 {ConfigureText procedure} -body {
     return $result
 } -cleanup {
     destroy .t .t2
-} -result {1234}
+} -result 1234
 test text-14.18 {ConfigureText procedure} -constraints fonts -setup {
     toplevel .top
     text .top.t -font {Courier -12} -borderwidth 2 -highlightthickness 2
@@ -3972,7 +3972,7 @@ test text-20.5 {TextFetchSelection procedure, long selections} -setup {
     expr {[selection get] eq "$x\n"}
 } -cleanup {
     destroy .t
-} -result {1}
+} -result 1
 
 
 test text-21.1 {TkTextLostSelection procedure} -constraints {x11} -setup {
@@ -6459,7 +6459,7 @@ test text-25.1 {text widget vs hidden commands} -body {
     destroy .t
     set x [list [winfo children .] [interp hidden]]
     expr {$x eq $y}
-} -result {1}
+} -result 1
 
 
 test text-26.1 {bug fix - 1642} -body {
@@ -6552,7 +6552,7 @@ test text-27.8 {TextEditCmd procedure, modified flag} -body {
     .t edit modified
 } -cleanup {
     destroy .t
-} -result {1}
+} -result 1
 test text-27.9 {TextEditCmd procedure, reset modified flag} -body {
     text .t
     pack .t
@@ -6561,7 +6561,7 @@ test text-27.9 {TextEditCmd procedure, reset modified flag} -body {
     .t edit modified
 } -cleanup {
     destroy .t
-} -result {0}
+} -result 0
 test text-27.10 {TextEditCmd procedure, set modified flag} -body {
     text .t
     pack .t
@@ -6569,7 +6569,7 @@ test text-27.10 {TextEditCmd procedure, set modified flag} -body {
     .t edit modified
 } -cleanup {
     destroy .t
-} -result {1}
+} -result 1
 test text-27.11 {TextEditCmd procedure, set modified flag repeat} -setup {
     text .t
     pack .t
@@ -6640,7 +6640,7 @@ test text-27.14a {<<Modified>> virtual event - propagation to peers} -body {
     set ::retval
 } -cleanup {
     destroy .t .tt
-} -result {4}
+} -result 4
 test text-27.15 {<<Selection>> virtual event on sel tagging} -body {
     set ::retval no_selection
     pack [text .t]
@@ -7081,7 +7081,7 @@ test text-29.4 {tabs - must be positive and must be increasing} -body {
     set result 1
 } -cleanup {
     destroy .t
-} -result {1}
+} -result 1
 
 
 test text-30.1 {repeated insert and scroll} -body {
@@ -7094,7 +7094,7 @@ test text-30.1 {repeated insert and scroll} -body {
     set result 1
 } -cleanup {
     destroy .t
-} -result {1}
+} -result 1
 test text-30.2 {repeated insert and scroll} -body {
     pack [text .t]
     for {set i 0} {$i < 30} {incr i} {
@@ -7105,7 +7105,7 @@ test text-30.2 {repeated insert and scroll} -body {
     set result 1
 } -cleanup {
     destroy .t
-} -result {1}
+} -result 1
 test text-30.3 {repeated insert and scroll} -body {
     pack [text .t]
     for {set i 0} {$i < 30} {incr i} {
@@ -7116,7 +7116,7 @@ test text-30.3 {repeated insert and scroll} -body {
     set result 1
 } -cleanup {
     destroy .t
-} -result {1}
+} -result 1
 test text-30.4 {repeated insert and scroll} -body {
     pack [text .t]
     for {set i 0} {$i < 30} {incr i} {
@@ -7127,7 +7127,7 @@ test text-30.4 {repeated insert and scroll} -body {
     set result 1
 } -cleanup {
     destroy .t
-} -result {1}
+} -result 1
 
 
 test text-31.1 {peer widgets} -body {
@@ -7217,7 +7217,7 @@ test text-31.7 {peer widgets} -body {
     expr {$p1 eq $p2}
 } -cleanup {
     destroy .t .top
-} -result {1}
+} -result 1
 test text-31.8 {peer widgets} -body {
     toplevel .top
     pack [text .t]
@@ -7444,7 +7444,7 @@ test text-32.1 {line heights on creation} -setup {
     expr {$before eq $after}
 } -cleanup {
     destroy .t
-} -result {1}
+} -result 1
 
 test text-32.2 {peer widget -start, -end and deletion (bug 1630262)} -setup {
     destroy .t .pt
@@ -7474,7 +7474,7 @@ test text-32.2 {peer widget -start, -end and deletion (bug 1630262)} -setup {
     set res 1
 } -cleanup {
     destroy .pt
-} -result {1}
+} -result 1
 
 test text-32.3 {peer widget -start, -end and deletion (bug 1630262)} -setup {
     destroy .t .pt
@@ -7568,7 +7568,7 @@ test text-32.2 {peer widget -start, -end and deletion (bug 1630262)} -setup {
     set res 1
 } -cleanup {
     destroy .pt
-} -result {1}
+} -result 1
 
 test text-32.3 {peer widget -start, -end and deletion (bug 1630262)} -setup {
     destroy .t .pt
diff --git a/tests/textDisp.test b/tests/textDisp.test
index f2d7047..6ab60af 100644
--- a/tests/textDisp.test
+++ b/tests/textDisp.test
@@ -4293,7 +4293,7 @@ test textDisp-34.1 {Line heights recalculation problem: bug 2677890} -setup {
     set negative
 } -cleanup {
     destroy .t1
-} -result {0}
+} -result 0
 
 test textDisp-35.1 {Init value of charHeight - Dancing scrollbar bug 1499165} -setup {
     pack [text .t1] -fill both -expand y -side left
diff --git a/tests/textTag.test b/tests/textTag.test
index 04a4b30..2fad125 100644
--- a/tests/textTag.test
+++ b/tests/textTag.test
@@ -78,7 +78,7 @@ test textTag-1.5 {tag configuration options} -body {
     .t tag cget x -borderwidth
 } -cleanup {
     .t tag configure x -borderwidth [lindex [.t tag configure x -borderwidth] 3]
-} -result {2}
+} -result 2
 test textTag-1.6 {configuration options} -body {
     .t tag configure x -borderwidth 46q
 } -cleanup {
@@ -128,7 +128,7 @@ test textTag-1.14 {tag configuration options} -body {
     .t tag cget x -lmargin1
 } -cleanup {
     .t tag configure x -lmargin1 [lindex [.t tag configure x -lmargin1] 3]
-} -result {10}
+} -result 10
 test textTag-1.15 {configuration options} -body {
     .t tag configure x -lmargin1 bad
 } -cleanup {
@@ -139,7 +139,7 @@ test textTag-1.16 {tag configuration options} -body {
     .t tag cget x -lmargin2
 } -cleanup {
     .t tag configure x -lmargin2 [lindex [.t tag configure x -lmargin2] 3]
-} -result {10}
+} -result 10
 test textTag-1.17 {configuration options} -body {
     .t tag configure x -lmargin2 bad
 } -cleanup {
@@ -161,7 +161,7 @@ test textTag-1.18 {tag configuration options} -body {
     .t tag cget x -offset
 } -cleanup {
     .t tag configure x -offset [lindex [.t tag configure x -offset] 3]
-} -result {2}
+} -result 2
 test textTag-1.19 {configuration options} -body {
     .t tag configure x -offset 100xyz
 } -cleanup {
@@ -205,7 +205,7 @@ test textTag-1.24 {tag configuration options} -body {
     .t tag cget x -rmargin
 } -cleanup {
     .t tag configure x -rmargin [lindex [.t tag configure x -rmargin] 3]
-} -result {10}
+} -result 10
 test textTag-1.25 {configuration options} -body {
     .t tag configure x -rmargin bad
 } -cleanup {
@@ -249,7 +249,7 @@ test textTag-1.26 {tag configuration options} -body {
     .t tag cget x -spacing1
 } -cleanup {
     .t tag configure x -spacing1 [lindex [.t tag configure x -spacing1] 3]
-} -result {10}
+} -result 10
 test textTag-1.27 {configuration options} -body {
     .t tag configure x -spacing1 bad
 } -cleanup {
@@ -260,7 +260,7 @@ test textTag-1.28 {tag configuration options} -body {
     .t tag cget x -spacing2
 } -cleanup {
     .t tag configure x -spacing2 [lindex [.t tag configure x -spacing2] 3]
-} -result {10}
+} -result 10
 test textTag-1.29 {configuration options} -body {
     .t tag configure x -spacing2 bad
 } -cleanup {
@@ -271,7 +271,7 @@ test textTag-1.30 {tag configuration options} -body {
     .t tag cget x -spacing3
 } -cleanup {
     .t tag configure x -spacing3 [lindex [.t tag configure x -spacing3] 3]
-} -result {10}
+} -result 10
 test textTag-1.31 {configuration options} -body {
     .t tag configure x -spacing3 bad
 } -cleanup {
@@ -399,7 +399,7 @@ test textTag-2.14 {tag add before -startline - Bug 1615425} -body {
     .tt tag add mytag 1.0 1.end
     destroy .ptt .tt
     set res 1
-} -result {1}
+} -result 1
 
 
 test textTag-3.1 {TkTextTagCmd - "bind" option} -body {
diff --git a/tests/textWind.test b/tests/textWind.test
index 7e2d315..eac4827 100644
--- a/tests/textWind.test
+++ b/tests/textWind.test
@@ -171,7 +171,7 @@ test textWind-2.7 {TkTextWindowCmd procedure, "cget" option} -setup {
     .t window cget .f -pady
 } -cleanup {
     destroy .f
-} -returnCodes ok -result {2}
+} -returnCodes ok -result 2
 test textWind-2.8 {TkTextWindowCmd procedure} -body {
     .t window co
 } -returnCodes error -result {wrong # args: should be ".t window configure index ?-option value ...?"}
@@ -1405,7 +1405,7 @@ test textWind-17.1 {peer widgets and embedded windows} -setup {
     update ; update
     destroy .t .tt
     winfo exists .f
-} -result {0}
+} -result 0
 
 test textWind-17.2 {peer widgets and embedded windows} -setup {
     destroy .t .f .tt
diff --git a/tests/tk.test b/tests/tk.test
index c5c475e..444c9a3 100644
--- a/tests/tk.test
+++ b/tests/tk.test
@@ -30,7 +30,7 @@ test tk-2.2 {tk command: appname} -body {
 test tk-2.3 {tk command: appname} -constraints unix -body {
     tk appname bazfoogarply
     expr {[lsearch -exact [winfo interps] [tk appname]] >= 0}
-} -result {1}
+} -result 1
 test tk-2.4 {tk command: appname} -body {
     tk appname [tk appname]
 } -result [tk appname]
@@ -66,21 +66,21 @@ test tk-3.7 {tk command: scaling: set new} -body {
 test tk-3.8 {tk command: scaling: negative} -body {
     tk scaling -1
     expr {[tk scaling] > 0}
-} -result {1}
+} -result 1
 test tk-3.9 {tk command: scaling: too big} -body {
     tk scaling 1000000
     expr {[tk scaling] < 10000}
-} -result {1}
+} -result 1
 test tk-3.10 {tk command: scaling: widthmm} -body {
     tk scaling 1.25
     expr {int((25.4*[winfo screenwidth .])/(72*1.25) + 0.5) \
         - [winfo screenmmwidth .]}
-} -result {0}
+} -result 0
 test tk-3.11 {tk command: scaling: heightmm} -body {
     tk scaling 1.25
     expr {int((25.4*[winfo screenheight .])/(72*1.25) + 0.5) \
         - [winfo screenmmheight .]}
-} -result {0}
+} -result 0
 tk scaling $scaling
 
 # Value stored to restore default settings after 4.* tests
@@ -139,7 +139,7 @@ test tk-5.5 {tk caret} -body {
 } -result {-height 12 -x 10 -y 11}
 test tk-5.6 {tk caret} -body {
     tk caret . -x 20 -y 25 -h 30; tk caret . -hei
-} -result {30}
+} -result 30
 
 # tk inactive
 test tk-6.1 {tk inactive} -body {
diff --git a/tests/ttk/entry.test b/tests/ttk/entry.test
index 26edca9..a2d6016 100644
--- a/tests/ttk/entry.test
+++ b/tests/ttk/entry.test
@@ -84,7 +84,7 @@ test entry-2.1.1 "Create entry before scrollbar - scrollbar catches up" -body {
     	-expand false -fill x
     update ; # no error
     lappend res [expr [lindex [.tsb get] 1] < 1] ; # scrollbar did update
-} -result {1} -cleanup {destroy .te .tsb}
+} -result 1 -cleanup {destroy .te .tsb}
 
 test entry-2.2 "Initial scroll position" -body {
     ttk::entry .e -font fixed -width 5 -xscrollcommand scroll
@@ -128,28 +128,28 @@ test entry-3.3 "xview" -body {
     .e insert end abcdefghijklmnopqrstuvwxyz
     .e xview end
     set result [.e index @0]
-} -result {7}
+} -result 7
 
 test entry-3.4 "xview" -body {
     .e delete 0 end;
     .e insert end abcdefghijklmnopqrstuvwxyz
     .e xview moveto 1.0
     set result [.e index @0]
-} -result {7}
+} -result 7
 
 test entry-3.5 "xview" -body {
     .e delete 0 end;
     .e insert end abcdefghijklmnopqrstuvwxyz
     .e xview scroll 5 units
     set result [.e index @0]
-} -result {5}
+} -result 5
 
 test entry-3.6 "xview" -body {
     .e delete 0 end;
     .e insert end [string repeat abcdefghijklmnopqrstuvwxyz 5]
     .e xview scroll 2 pages
     set result [.e index @0]
-} -result {40}
+} -result 40
 
 test entry-3.last "Series 3 cleanup" -body {
     destroy .e
diff --git a/tests/ttk/spinbox.test b/tests/ttk/spinbox.test
index 38bae14..2573e57 100644
--- a/tests/ttk/spinbox.test
+++ b/tests/ttk/spinbox.test
@@ -148,7 +148,7 @@ test spinbox-1.8.4 "-validate option: " -setup {
     set ::spinbox_test
 } -cleanup {
     destroy .sb
-} -result {50}
+} -result 50
 
 
 test spinbox-2.0 "current command -- unset should be 0" -constraints nyi -setup {
@@ -220,6 +220,66 @@ test spinbox-3.0 "textarea should expand to fill widget" -setup {
     unset -nocomplain ::spinbox_test SBV
 } -result {textarea}
 
+test spinbox-4.0 "Increment with duplicates in -values, wrap" -setup {
+    ttk::spinbox .sb -values {one two three 4 5 two six} -wrap true
+    set max [expr {[llength [.sb cget -values]] + 2}]
+} -body {
+    set ::spinbox_test [.sb get]
+    for {set i 0} {$i < $max} {incr i} {
+        event generate .sb <<Increment>>
+        lappend ::spinbox_test [.sb get]
+    }
+    for {set i 0} {$i < $max} {incr i} {
+        event generate .sb <<Decrement>>
+        lappend ::spinbox_test [.sb get]
+    }
+    set ::spinbox_test
+} -cleanup {
+    destroy .sb
+    unset -nocomplain ::spinbox_test max
+} -result {one two three 4 5 two six one two one six two 5 4 three two one six}
+
+test spinbox-4.1 "Increment with duplicates in -values, wrap, initial value set" -setup {
+    ttk::spinbox .sb -values {one two three 4 5 two six} -wrap true
+    set max [expr {[llength [.sb cget -values]] + 2}]
+} -body {
+    .sb set three
+    set ::spinbox_test [.sb get]
+    for {set i 0} {$i < $max} {incr i} {
+        event generate .sb <<Increment>>
+        lappend ::spinbox_test [.sb get]
+    }
+    .sb set two    ; # the first "two" in the -values list becomes the current value
+    for {set i 0} {$i < $max} {incr i} {
+        event generate .sb <<Decrement>>
+        lappend ::spinbox_test [.sb get]
+    }
+    set ::spinbox_test
+} -cleanup {
+    destroy .sb
+    unset -nocomplain ::spinbox_test max
+} -result {three 4 5 two six one two three 4 5 one six two 5 4 three two one six}
+
+test spinbox-4.2 "Increment with duplicates in -values, no wrap" -setup {
+    ttk::spinbox .sb -values {one two three 4 5 two six} -wrap false
+    set max [expr {[llength [.sb cget -values]] + 2}]
+} -body {
+    set ::spinbox_test [.sb get]
+    for {set i 0} {$i < $max} {incr i} {
+        event generate .sb <<Increment>>
+        lappend ::spinbox_test [.sb get]
+    }
+    for {set i 0} {$i < $max} {incr i} {
+        event generate .sb <<Decrement>>
+        lappend ::spinbox_test [.sb get]
+    }
+    set ::spinbox_test
+} -cleanup {
+    destroy .sb
+    unset -nocomplain ::spinbox_test max
+} -result {one two three 4 5 two six six six two 5 4 three two one one one one}
+
+
 # nostomp: NB intentional difference between ttk::spinbox and tk::spinbox;
 # see also #1439266
 #
diff --git a/tests/ttk/treeview.test b/tests/ttk/treeview.test
index 43dd249..4236b01 100644
--- a/tests/ttk/treeview.test
+++ b/tests/ttk/treeview.test
@@ -466,7 +466,7 @@ test treeview-8.6 "Selection - <<TreeviewSelect>> on selection add" -body {
     .tv selection add newnode.n1
     update
     set res
-} -result {1}
+} -result 1
 
 test treeview-8.7 "<<TreeviewSelect>> on selected item deletion" -body {
     .tv selection set {}
@@ -560,7 +560,7 @@ test treeview-9.3 {scrolling on see command, requested item is closed} -setup {
     expr $after < $before
 } -cleanup {
     destroy .top
-} -result {1}
+} -result 1
 
 ### identify tests:
 #
diff --git a/tests/unixEmbed.test b/tests/unixEmbed.test
index c0a5bac..b322ef7 100644
--- a/tests/unixEmbed.test
+++ b/tests/unixEmbed.test
@@ -114,7 +114,7 @@ test unixEmbed-1.3 {TkpUseWindow procedure, inheriting colormap} -constraints {
     colorsFree .x
 } -cleanup {
 	deleteWindows
-} -result {0}
+} -result 0
 test unixEmbed-1.4 {TkpUseWindow procedure, inheriting colormap} -constraints {
 	unix nonPortable
 } -setup {
@@ -127,7 +127,7 @@ test unixEmbed-1.4 {TkpUseWindow procedure, inheriting colormap} -constraints {
     colorsFree .x
 } -cleanup {
 	deleteWindows
-} -result {1}
+} -result 1
 
 test unixEmbed-1.5 {TkpUseWindow procedure, creating Container records} -constraints {
 	unix testembed notAqua
diff --git a/tests/unixSelect.test b/tests/unixSelect.test
index a702587..d3da806 100644
--- a/tests/unixSelect.test
+++ b/tests/unixSelect.test
@@ -121,7 +121,7 @@ test unixSelect-1.1 {TkSelGetSelection procedure: simple i18n text} -constraints
 } -cleanup {
     cleanupbg
     destroy .e
-} -result {4}
+} -result 4
 
 test unixSelect-1.2 {TkSelGetSelection procedure: simple i18n text, iso8859-1} -constraints {
     x11
@@ -331,7 +331,7 @@ test unixSelect-1.13 {TkSelGetSelection procedure: simple i18n text, utf-8} -con
 } -cleanup {
     destroy .e
     cleanupbg
-} -result {5}
+} -result 5
 
 test unixSelect-1.14 {TkSelGetSelection procedure: simple i18n text, utf-8} -constraints {
     x11
diff --git a/tests/util.test b/tests/util.test
index d457b50..ed4a276 100644
--- a/tests/util.test
+++ b/tests/util.test
@@ -39,22 +39,22 @@ test util-1.7 {Tk_GetScrollInfo procedure} -body {
     .l yview 0
     .l yview scroll 2 pages
     .l nearest 0
-} -result {6}
+} -result 6
 test util-1.8 {Tk_GetScrollInfo procedure} -body {
     .l yview 15
     .l yview scroll -2 pages
     .l nearest 0
-} -result {9}
+} -result 9
 test util-1.9 {Tk_GetScrollInfo procedure} -body {
     .l yview 0
     .l yview scroll 2 units
     .l nearest 0
-} -result {2}
+} -result 2
 test util-1.10 {Tk_GetScrollInfo procedure} -body {
     .l yview 15
     .l yview scroll -2 units
     .l nearest 0
-} -result {13}
+} -result 13
 test util-1.11 {Tk_GetScrollInfo procedure} -body {
     .l yview scroll 3 zips
 } -returnCodes error -result {bad argument "zips": must be pages or units}
diff --git a/tests/visual.test b/tests/visual.test
index 13d6fd2..8d63097 100644
--- a/tests/visual.test
+++ b/tests/visual.test
@@ -455,7 +455,7 @@ test visual-7.1 {Tk_GetColormap, "new"} -constraints {
     colorsFree .t2
 } -cleanup {
     deleteWindows
-} -result {0}
+} -result 0
 test visual-7.2 {Tk_GetColormap, "new"} -constraints {
     defaultPseudocolor8 nonPortable
 } -setup {
@@ -468,7 +468,7 @@ test visual-7.2 {Tk_GetColormap, "new"} -constraints {
     colorsFree .t2
 } -cleanup {
     deleteWindows
-} -result {1}
+} -result 1
 test visual-7.3 {Tk_GetColormap, copy from other window} -constraints {
     defaultPseudocolor8 nonPortable
 } -setup {
@@ -484,7 +484,7 @@ test visual-7.3 {Tk_GetColormap, copy from other window} -constraints {
     colorsFree .t2
 } -cleanup {
     deleteWindows
-} -result {1}
+} -result 1
 test visual-7.4 {Tk_GetColormap, copy from other window} -constraints {
     defaultPseudocolor8 nonPortable
 } -setup {
@@ -500,7 +500,7 @@ test visual-7.4 {Tk_GetColormap, copy from other window} -constraints {
     colorsFree .t2
 } -cleanup {
     deleteWindows
-} -result {0}
+} -result 0
 test visual-7.5 {Tk_GetColormap, copy from other window} -constraints {
     defaultPseudocolor8 nonPortable
 } -setup {
diff --git a/tests/winDialog.test b/tests/winDialog.test
index e70ae3f..280d69e 100755
--- a/tests/winDialog.test
+++ b/tests/winDialog.test
@@ -118,7 +118,7 @@ test winDialog-1.1 {Tk_ChooseColorObjCmd} -constraints {
     then {
         Click cancel
     }
-} -result {0}
+} -result 0
 test winDialog-1.2 {Tk_ChooseColorObjCmd} -constraints {
     testwinevent
 } -body {
@@ -229,7 +229,7 @@ test winDialog-5.1 {GetFileName: no arguments} -constraints {
     then {
         Click cancel
     }
-} -result {0}
+} -result 0
 test winDialog-5.2 {GetFileName: one argument} -constraints {
     nt
 } -body {
@@ -242,7 +242,7 @@ test winDialog-5.3 {GetFileName: many arguments} -constraints {
     then {
         Click cancel
     }
-} -result {0}
+} -result 0
 test winDialog-5.4 {GetFileName: Tcl_GetIndexFromObj() != TCL_OK} -constraints {
     nt
 } -body {
@@ -259,7 +259,7 @@ test winDialog-5.5 {GetFileName: Tcl_GetIndexFromObj() == TCL_OK} -constraints {
     # https://core.tcl-lang.org/tk/tktview/4a0451f5291b3c9168cc560747dae9264e1d2ef6
     # $x is expected to be empty
     append x $y
-} -result {0}
+} -result 0
 test winDialog-5.6 {GetFileName: valid option, but missing value} -constraints {
     nt
 } -body {
@@ -726,7 +726,7 @@ test winDialog-5.16 {GetFileName: parent} -constraints {
         destroy .t
     }
     return $x
-} -result {1}
+} -result 1
 test winDialog-5.17 {GetFileName: title} -constraints {
     nt testwinevent
 } -body {
@@ -736,7 +736,7 @@ test winDialog-5.17 {GetFileName: title} -constraints {
     then {
         Click cancel
     }
-} -result {0}
+} -result 0
 if {[vista?]} {
     # In the newer file dialogs, the file type widget does not even exist
     # if no file types specified
@@ -841,7 +841,7 @@ test winDialog-5.24 {GetFileName: file types: MakeFilter() succeeds} -constraint
         Click cancel
     }
     return $x
-} -result {0}
+} -result 0
 test winDialog-5.25 {GetFileName: file types: MakeFilter() succeeds} -constraints {
     nt
 } -body {
@@ -852,7 +852,7 @@ test winDialog-5.25 {GetFileName: file types: MakeFilter() succeeds} -constraint
         Click cancel
     }
     return $x
-} -result {0}
+} -result 0
 
 
 test winDialog-6.1 {MakeFilter} -constraints {emptyTest nt} -body {}
@@ -877,7 +877,7 @@ test winDialog-9.1 {Tk_ChooseDirectoryObjCmd: no arguments} -constraints {
     }]
     # $x should be "" on a Cancel
     append x $y
-} -result {0}
+} -result 0
 test winDialog-9.2 {Tk_ChooseDirectoryObjCmd: one argument} -constraints {
     nt
 } -body {
@@ -892,7 +892,7 @@ test winDialog-9.3 {Tk_ChooseDirectoryObjCmd: many arguments} -constraints {
     then {
         Click cancel
     }
-} -result {0}
+} -result 0
 test winDialog-9.4 {Tk_ChooseDirectoryObjCmd: Tcl_GetIndexFromObj() != TCL_OK} -constraints {
     nt
 } -body {
@@ -905,7 +905,7 @@ test winDialog-9.5 {Tk_ChooseDirectoryObjCmd: Tcl_GetIndexFromObj() == TCL_OK} -
     then {
         Click cancel
     }
-} -result {0}
+} -result 0
 test winDialog-9.6 {Tk_ChooseDirectoryObjCmd: valid option, but missing value} -constraints {
     nt
 } -body {
diff --git a/tests/winFont.test b/tests/winFont.test
index 23c09c9..599b091 100644
--- a/tests/winFont.test
+++ b/tests/winFont.test
@@ -37,12 +37,12 @@ test winfont-2.1 {TkpGetFontFromAttributes procedure: pointsize} -constraints {
     win
 } -body {
     expr {[font actual {-size -10} -size] > 0}
-} -result {1}
+} -result 1
 test winfont-2.2 {TkpGetFontFromAttributes procedure: pointsize} -constraints {
     win
 } -body {
     expr {[font actual {-family Arial} -size] > 0}
-} -result {1}
+} -result 1
 test winfont-2.3 {TkpGetFontFromAttributes procedure: normal weight} -constraints {
     win
 } -body {
@@ -221,7 +221,7 @@ test winfont-5.5 {Tk_MeasureChars procedure: include last partial char} -constra
     .t.c index $t @[expr {int($cx*2.5)}],1
 } -cleanup {
     destroy .t.c
-} -result {2}
+} -result 2
 
 test winfont-5.6 {Tk_MeasureChars procedure: at least one char on line} -constraints {
     win
@@ -337,7 +337,7 @@ test winfont-5.11 {Tk_MeasureChars procedure: check for kerning} -constraints {
     expr {$x < ($width*10)}
 } -cleanup {
     destroy .t.l
-} -result {1}
+} -result 1
 
 
 test winfont-6.1 {Tk_DrawChars procedure: loop test} -constraints win -setup {
@@ -375,12 +375,12 @@ test winfont-7.3 {AllocFont procedure: extract info from textmetric} -constraint
     win
 } -body {
     font metric {arial 10 bold italic underline overstrike} -fixed
-} -result {0}
+} -result 0
 test winfont-7.4 {AllocFont procedure: extract info from textmetric} -constraints {
     win
 } -body {
     font metric systemfixed -fixed
-} -result {1}
+} -result 1
 
 # cleanup
 cleanupTests
diff --git a/tests/winWm.test b/tests/winWm.test
index 0064c5a..705e355 100644
--- a/tests/winWm.test
+++ b/tests/winWm.test
@@ -274,7 +274,7 @@ test winWm-6.2 {wm attributes} -constraints win -setup {
     wm attributes .t -disabled
 } -cleanup {
     destroy .t
-} -result {0}
+} -result 0
 test winWm-6.3 {wm attributes} -constraints win -setup {
     destroy .t
 } -body {
diff --git a/tests/winfo.test b/tests/winfo.test
index 49a92a6..d39359b 100644
--- a/tests/winfo.test
+++ b/tests/winfo.test
@@ -174,7 +174,7 @@ test winfo-4.7 {"winfo containing" command} -setup {
     expr {($x == ".") || ($x == "")}
 } -cleanup {
     destroy .t
-} -result {1}
+} -result 1
 
 
 test winfo-5.1 {"winfo interps" command} -body {
@@ -188,10 +188,10 @@ test winfo-5.3 {"winfo interps" command} -body {
 } -returnCodes error -result {bad window path name "geek"}
 test winfo-5.4 {"winfo interps" command} -constraints unix -body {
     expr {[lsearch -exact [winfo interps] [tk appname]] >= 0}
-} -result {1}
+} -result 1
 test winfo-5.5 {"winfo interps" command} -constraints unix -body {
     expr {[lsearch -exact [winfo interps -displayof .] [tk appname]] >= 0}
-} -result {1}
+} -result 1
 
 
 test winfo-6.1 {"winfo exists" command} -body {
@@ -202,10 +202,10 @@ test winfo-6.2 {"winfo exists" command} -body {
 } -returnCodes error -result {wrong # args: should be "winfo exists window"}
 test winfo-6.3 {"winfo exists" command} -body {
     winfo exists gorp
-} -result {0}
+} -result 0
 test winfo-6.4 {"winfo exists" command} -body {
     winfo exists .
-} -result {1}
+} -result 1
 test winfo-6.5 {"winfo exists" command} -setup {
     destroy .b
 } -body {
@@ -290,13 +290,13 @@ test winfo-9.2 {"winfo viewable" command} -body {
 } -returnCodes error -result {bad window path name "foo"}
 test winfo-9.3 {"winfo viewable" command} -body {
     winfo viewable .
-} -result {1}
+} -result 1
 test winfo-9.4 {"winfo viewable" command} -body {
     wm iconify .
     winfo viewable .
 } -cleanup {
     wm deiconify .
-} -result {0}
+} -result 0
 test winfo-9.5 {"winfo viewable" command} -setup {
     deleteWindows
 } -body {
@@ -344,7 +344,7 @@ test winfo-10.2 {"winfo visualid" command} -body {
 } -returnCodes error -result {bad window path name "gorp"}
 test winfo-10.3 {"winfo visualid" command} -body {
     expr {2 + [winfo visualid .] - [winfo visualid .]}
-} -result {2}
+} -result 2
 
 
 test winfo-11.1 {"winfo visualid" command} -body {
@@ -358,14 +358,14 @@ test winfo-11.3 {"winfo visualid" command} -body {
 } -returnCodes error -result {wrong # args: should be "winfo visualsavailable window ?includeids?"}
 test winfo-11.4 {"winfo visualid" command} -body {
     llength [lindex [winfo visualsa .] 0]
-} -result {2}
+} -result 2
 test winfo-11.5 {"winfo visualid" command} -body {
     llength [lindex [winfo visualsa . includeids] 0]
-} -result {3}
+} -result 3
 test winfo-11.6 {"winfo visualid" command} -body {
     set x [lindex [lindex [winfo visualsa . includeids] 0] 2]
     expr {$x + 2 - $x}
-} -result {2}
+} -result 2
 
 
 test winfo-12.1 {GetDisplayOf procedure} -body {
diff --git a/tests/wm.test b/tests/wm.test
index 2978c1b..e9110bc 100644
--- a/tests/wm.test
+++ b/tests/wm.test
@@ -1484,14 +1484,14 @@ test wm-stackorder-4.1 {wm stackorder isabove|isbelow} -body {
     wm stackorder . isabove .t
 } -cleanup {
     destroy .t
-} -result {0}
+} -result 0
 test wm-stackorder-4.2 {wm stackorder isabove|isbelow} -body {
     toplevel .t ; update
     raise .t
     wm stackorder . isbelow .t
 } -cleanup {
     destroy .t
-} -result {1}
+} -result 1
 test wm-stackorder-4.3 {wm stackorder isabove|isbelow} -body {
     toplevel .t ; update
     raise .
@@ -1499,7 +1499,7 @@ test wm-stackorder-4.3 {wm stackorder isabove|isbelow} -body {
     wm stackorder .t isa .
 } -cleanup {
     destroy .t
-} -result {0}
+} -result 0
 test wm-stackorder-4.4 {wm stackorder isabove|isbelow} -body {
     toplevel .t ; update
     raise .
@@ -1507,7 +1507,7 @@ test wm-stackorder-4.4 {wm stackorder isabove|isbelow} -body {
     wm stackorder .t isb .
 } -cleanup {
     destroy .t
-} -result {1}
+} -result 1
 deleteWindows
 
 test wm-stackorder-5.1 {a menu is not a toplevel} -body {
@@ -2277,7 +2277,7 @@ test wm-forget-1.1 "bug #2009788: forget toplevel can cause crash" -body {
     winfo exists .parent.child
 } -cleanup {
     deleteWindows
-}  -result {1}
+}  -result 1
 test wm-forget-1.2 "bug #2009788: forget toplevel can cause crash" -body {
     toplevel .parent
     update
@@ -2286,7 +2286,7 @@ test wm-forget-1.2 "bug #2009788: forget toplevel can cause crash" -body {
     winfo exists .parent.child
 } -cleanup {
     deleteWindows
-}  -result {1}
+}  -result 1
 test wm-forget-1.3 "bug #2009788: forget toplevel can cause crash" -body {
     toplevel .parent
     toplevel .parent.child
@@ -2295,7 +2295,7 @@ test wm-forget-1.3 "bug #2009788: forget toplevel can cause crash" -body {
     winfo exists .parent.child
 } -cleanup {
     deleteWindows
-}  -result {1}
+}  -result 1
 test wm-forget-1.4 "pack into unmapped toplevel causes crash" -body {
     toplevel .parent
     toplevel .parent.child