diff --git a/TAGS b/TAGS
index 2afa6fb6..a427a658 100644
--- a/TAGS
+++ b/TAGS
@@ -173,81 +173,81 @@ function __sliceType(1781,54832
 function __arrayType(1864,56609
 
 pkg/compiler/prelude/chan.lua,350
-local function random_choice(138,4265
-local function scheduler(225,6264
-function __task_ready(296,8569
-local function spawn(310,8903
-local function altcopy(348,10014
-local function altalldequeue(391,11038
-local function altcanexec(401,11283
-local function __fldcnt(446,12621
-local function select(460,12957
-      local function f(671,19402
+local function random_choice(138,4285
+local function scheduler(225,6294
+function __task_ready(296,8609
+local function spawn(310,8943
+local function altcopy(348,10054
+local function altalldequeue(391,11078
+local function altcanexec(401,11323
+local function __fldcnt(446,12661
+local function select(460,12997
+      local function f(671,19442
 
 pkg/compiler/prelude/chan_test.lua,531
       local function counter(7,88
       local function main(14,231
       local function main(31,642
       local function a(53,1221
-      local function a(85,2319
-      local function b(90,2416
-      local function fib(108,2857
-      local function main(115,3008
-      local function main(138,3573
-      local function counter(166,4498
-      local function filter(174,4642
-      local function sieve(183,4853
-      local function main(194,5159
-      local function counter(213,5642
-      local function main(221,5786
-
-pkg/compiler/prelude/complex.lua,1479
+      local function a(85,2339
+      local function b(90,2436
+      local function fib(108,2877
+      local function main(115,3028
+      local function main(138,3593
+      local function counter(166,4518
+      local function filter(174,4662
+      local function sieve(183,4873
+      local function main(194,5179
+      local function counter(213,5662
+      local function main(221,5806
+
+pkg/compiler/prelude/complex.lua,1480
 local function __truncateToInt(24,713
 local function complex(33,872
 local function real(44,1184
 local function imag(57,1467
-local function cexp(89,2061
-local function conj(93,2103
-local function cabs(99,2241
-local function phase(118,2720
-local function polar(124,2867
-local function rect(135,3215
-local function clog(146,3567
-local function clogf(153,3797
-local function csqrt(206,5049
-function cmath.Sin(230,5426
-function cmath.Sin(Sin
230,5426
-function cmath.Cos(234,5526
-function cmath.Cos(Cos
234,5526
-function cmath.Tan(238,5627
-function cmath.Tan(Tan
238,5627
-function __reducePi(245,5805
-function __tanSeries(261,6315
-function cmath.Cot(322,7526
-function cmath.Cot(Cot
322,7526
-function cmath.Sinh(334,7751
-function cmath.Sinh(Sinh
334,7751
-function cmath.Cosh(338,7852
-function cmath.Cosh(Cosh
338,7852
-function cmath.Tanh(342,7953
-function cmath.Tanh(Tanh
342,7953
-function cmath.Asin(362,8329
-function cmath.Asin(Asin
362,8329
-function cmath.Acos(379,8770
-function cmath.Acos(Acos
379,8770
-function cmath.Atan(382,8834
-function cmath.Atan(Atan
382,8834
-function cmath.Atan2(387,9012
-function cmath.Atan2(Atan2
387,9012
-function cmath.Asinh(396,9324
-function cmath.Asinh(Asinh
396,9324
-function cmath.Acosh(399,9380
-function cmath.Acosh(Acosh
399,9380
-function cmath.Atanh(402,9451
-function cmath.Atanh(Atanh
402,9451
-function cmath.ComplexLog(409,9609
-function cmath.ComplexLog(ComplexLog
409,9609
-function check(467,11433
+local function cexp(93,2261
+local function conj(97,2303
+local function cabs(103,2441
+local function phase(122,2920
+local function polar(128,3067
+local function rect(139,3415
+local function clog(150,3767
+local function clogf(157,3997
+local function csqrt(210,5249
+function cmath.Sin(234,5626
+function cmath.Sin(Sin
234,5626
+function cmath.Cos(238,5726
+function cmath.Cos(Cos
238,5726
+function cmath.Tan(242,5827
+function cmath.Tan(Tan
242,5827
+function __reducePi(249,6005
+function __tanSeries(265,6515
+function cmath.Cot(326,7726
+function cmath.Cot(Cot
326,7726
+function cmath.Sinh(338,7951
+function cmath.Sinh(Sinh
338,7951
+function cmath.Cosh(342,8052
+function cmath.Cosh(Cosh
342,8052
+function cmath.Tanh(346,8153
+function cmath.Tanh(Tanh
346,8153
+function cmath.Asin(366,8529
+function cmath.Asin(Asin
366,8529
+function cmath.Acos(383,8970
+function cmath.Acos(Acos
383,8970
+function cmath.Atan(386,9034
+function cmath.Atan(Atan
386,9034
+function cmath.Atan2(391,9212
+function cmath.Atan2(Atan2
391,9212
+function cmath.Asinh(400,9524
+function cmath.Asinh(Asinh
400,9524
+function cmath.Acosh(403,9580
+function cmath.Acosh(Acosh
403,9580
+function cmath.Atanh(406,9651
+function cmath.Atanh(Atanh
406,9651
+function cmath.ComplexLog(413,9809
+function cmath.ComplexLog(ComplexLog
413,9809
+function check(471,11633
 
 pkg/compiler/prelude/defer.lua,20
 function __ts(4,75
@@ -267,11 +267,11 @@ function __NewDFSState(218,5339
 function __testDFS(241,5877
 
 pkg/compiler/prelude/int64.lua,33
-function __newByteArray(64,1493
+function __newByteArray(66,1517
 
 pkg/compiler/prelude/math.lua,46
-function __max(36,731
-function __min(43,807
+function __max(40,801
+function __min(47,877
 
 pkg/compiler/prelude/prelude.lua,70
 function __gi_GetRangeCheck(4,84
@@ -280,46 +280,47 @@ function __gi_SetRangeCheck(21,599
 pkg/compiler/prelude/rune.lua,27
 function __decodeRune(1,0
 
-pkg/compiler/prelude/tsys.lua,1440
-function __storeBuiltins(23,556
-function __sorted_keys(32,754
-function __gls(42,912
-function __ls(52,1126
-function __lst(71,1665
-function __glst(84,2005
-function __minifs.renameBasedFileExists(147,3443
-function __minifs.renameBasedFileExists(renameBasedFileExists
147,3443
-function __minifs.dirExists(158,3674
-function __minifs.dirExists(dirExists
158,3674
-function __lenz(251,6375
-function __lenzi(271,6835
-function __ipairsZeroCheck(286,7149
-function __assertIsArray(389,9428
-function __addressof(399,9599
-function __st(411,9935
-function __mapAndJoinStrings(530,13297
-                        function()(
632,15946
-                         function()(
660,16781
-   local function stateless_iter(940,24670
-function __starToAsterisk(1193,33164
-function __newAnyArrayValue(1232,34316
-         function(getter,(getter
1397,38828
-function __methodSet(1941,58295
-function __gijitTypeToGoType(2152,65232
-function __Chan(2206,66765
-function __Chan_GopherJS(2242,67666
-function __addChildTypesHelper(2262,68354
-function __interfaceStrHelper(2317,70743
-      local function stateless_iter(2527,76865
-function __basicValue2kind(2653,80654
-function __field2strHelper(2743,83166
-function __typeKeyHelper(2752,83391
-function __zipairs(2954,89124
-function __elim0(2977,89670
-function __unpack0(3020,90391
-function __lazy_ellipsis(3036,90629
-function __printHelper(3045,90791
-function __gijit_printQuoted(3062,91156
+pkg/compiler/prelude/tsys.lua,1483
+function __storeBuiltins(35,908
+function __sorted_keys(44,1106
+function __gls(54,1264
+function __ls(64,1478
+function __lst(83,2017
+function __glst(96,2357
+function __minifs.renameBasedFileExists(159,3795
+function __minifs.renameBasedFileExists(renameBasedFileExists
159,3795
+function __minifs.dirExists(170,4026
+function __minifs.dirExists(dirExists
170,4026
+function __lenz(264,6760
+function __lenzi(284,7220
+function __ipairsZeroCheck(299,7534
+function __assertIsArray(403,9837
+function __addressof(413,10008
+function __st(425,10344
+function __mapAndJoinStrings(544,13706
+                        function()(
646,16355
+                         function()(
674,17190
+   local function stateless_iter(957,25220
+function __starToAsterisk(1210,33714
+function __newAnyArrayValue(1249,34866
+         function(getter,(getter
1430,39823
+function __methodSet(1970,59222
+function __gijitTypeToGoType(2181,66159
+function __Chan(2235,67742
+function __Chan_GopherJS(2271,68643
+function __addChildTypesHelper(2291,69331
+function __interfaceStrHelper(2346,71720
+      local function stateless_iter(2557,77849
+function __basicValue2kind(2683,81638
+function __field2strHelper(2773,84150
+function __typeKeyHelper(2782,84375
+function __zipairs(3008,90609
+function __elim0(3031,91155
+function __unpack0(3074,91876
+function __lazy_ellipsis(3090,92114
+function __printHelper(3099,92276
+function __gijit_printQuoted(3116,92641
+function __get_local_value(3339,99562
 
 pkg/compiler/prelude/tutil.lua,51
 function __ValEq(5,51
@@ -334,34 +335,33 @@ local function utf8upper 272,7232
 local function utf8lower 277,7384
 local function utf8reverse 283,7517
 local function utf8char(313,8122
-local function utf8gensub(389,10103
-local function binsearch(411,10630
-local function classMatchGenerator(432,11126
-	local function inRanges(543,14575
-local function utf8subWithBytes 564,15059
-local function matcherGenerator(613,16014
-	local function simple(623,16202
-	local function star(633,16364
-	local function minus(643,16538
-	local function question(651,16681
-	local function capture(661,16851
-	local function captureStart(676,17277
-	local function captureStop(682,17405
-	local function balancer(689,17537
-local function utf8find(945,23952
-local function utf8match(951,24121
-local function utf8gmatch(963,24365
-local function replace(978,24745
-local function utf8gsub(1012,25383
+local function utf8gensub(389,10163
+local function binsearch(411,10690
+local function classMatchGenerator(432,11206
+	local function inRanges(543,14655
+local function utf8subWithBytes 564,15139
+local function matcherGenerator(613,16094
+	local function simple(623,16282
+	local function star(633,16444
+	local function minus(643,16618
+	local function question(651,16761
+	local function capture(661,16931
+	local function captureStart(676,17357
+	local function captureStop(682,17485
+	local function balancer(689,17617
+local function utf8find(945,24032
+local function utf8match(951,24201
+local function utf8gmatch(963,24445
+local function replace(978,24825
+local function utf8gsub(1012,25463
+
+pkg/compiler/prelude/zgoro.lua,22
+function __go(12,331
 
 pkg/compiler/prelude/zgoro_test.lua,57
 local function counter(7,71
 local function main(15,187
 
-pkg/compiler/snippet/snoopy.lua,72
-	    function Beagle:Write(5,97
-	    function Beagle:Write(Write
5,97
-
 pkg/utf8/utf8.lua,986
 local function utf8charbytes 82,3157
 local function utf8len 179,5239
@@ -605,25 +605,25 @@ local function immexpr(677,20518
 local function dispexpr(709,21328
 local function rtexpr(733,22072
 local function parseoperand(752,22672
-local function dopattern(1772,55835
-local function templatehelp(1918,60539
-local function matchtm(1932,60948
-  function map_op.mov64_2(2015,63401
-  function map_op.mov64_2(mov64_2
2015,63401
-local function op_data(2058,64675
-local function dumptypes(2212,69616
-function _M.section(2228,70077
-function _M.section(section
2228,70077
-function _M.dumparch(2237,70304
-function _M.dumparch(dumparch
2237,70304
-function _M.dumpdef(2245,70512
-function _M.dumpdef(dumpdef
2245,70512
-function _M.passcb(2254,70740
-function _M.passcb(passcb
2254,70740
-function _M.setup(2260,70879
-function _M.setup(setup
2260,70879
-function _M.mergemaps(2265,70992
-function _M.mergemaps(mergemaps
2265,70992
+local function dopattern(1791,56348
+local function templatehelp(1937,61052
+local function matchtm(1951,61461
+  function map_op.mov64_2(2034,63914
+  function map_op.mov64_2(mov64_2
2034,63914
+local function op_data(2077,65188
+local function dumptypes(2231,70129
+function _M.section(2247,70590
+function _M.section(section
2247,70590
+function _M.dumparch(2256,70817
+function _M.dumparch(dumparch
2256,70817
+function _M.dumpdef(2264,71025
+function _M.dumpdef(dumpdef
2264,71025
+function _M.passcb(2273,71253
+function _M.passcb(passcb
2273,71253
+function _M.setup(2279,71392
+function _M.setup(setup
2279,71392
+function _M.mergemaps(2284,71505
+function _M.mergemaps(mergemaps
2284,71505
 
 vendor/github.com/LuaJIT/LuaJIT/dynasm/dynasm.lua,2323
 local function wline(72,2733
@@ -1161,12 +1161,6 @@ vendor/github.com/LuaJIT/LuaJIT/dynasm/dasm_x64.lua,0
 
 vendor/github.com/LuaJIT/LuaJIT/dynasm/dasm_mips64.lua,0
 
-pkg/compiler/tmp/port.lua,0
-
-pkg/compiler/tmp/mset.lua,0
-
-pkg/compiler/prelude/zgoro.lua,0
-
 pkg/compiler/prelude/tsys_test.lua,0
 
 pkg/compiler/prelude/string.lua,0