diff --git a/test/manual/etags/ETAGS.good_1 b/test/manual/etags/ETAGS.good_1
index c3d1477d44c..4baaff4c425 100644
--- a/test/manual/etags/ETAGS.good_1
+++ b/test/manual/etags/ETAGS.good_1
@@ -2941,92 +2941,92 @@ complete(328,10055
 add_active(340,10527
 parse(353,10949
 derived_analyses(364,11341
-build(378,11965
-buildact(392,12521
-mapsyn(412,13542
-add_edge(434,14278
-findcats(447,14758
-normalize_tree(465,15478
-normalize_trees(475,15856
-expandmng_tree(486,16248
-expandmng_trees(496,16614
-cat(511,17013
-subtree(644,21266
-hypothetical_mem(653,21565
-make_coor(667,22130
-start_up:-start_up
688,23013
-tokenizeatom(710,23921
-tokenize(720,24348
-isoperator(752,25377
-isoptab(756,25431
-specialsymbol(765,25756
-sstab(771,25861
-parse_cgi(787,26347
-keyvalseq(792,26510
-andkeyvalseq(796,26609
-keyval(799,26688
-valseq(807,26920
-plusvalseq(810,27007
-val(816,27109
-argvals(824,27426
-commaargvals(828,27503
-atomval(833,27578
-atom(836,27640
-action(846,28004
-keyvalcgi(864,28649
-keyvalscgi(865,28670
-outsyn(868,28726
-act(876,29060
-actout(901,29906
-texttreelist(912,30089
-htmltreelist(918,30190
-fitchtreelist(924,30304
-pp_html_table_tree(938,30759
-pp_html_tree(949,31113
-pp_html_trees(988,32381
-pp_html_table_fitch_tree(999,32769
-pp_html_fitch_tree(1017,33672
-removeexp(1129,39002
-splitexp(1142,39490
-pp_exp(1155,39990
-map_word(1168,40249
-pp_exps(1180,40474
-pp_tree(1188,40777
-pp_trees(1216,41807
-pp_word_list(1225,42128
-pp_word(1231,42262
-pp_word_list_rest(1238,42569
-pp_cat(1248,42929
-pp_syn(1255,43196
-pp_syn_paren(1276,43899
-pp_paren(1293,44377
-pp_syn_back(1300,44661
-pp_bas_cat(1311,45001
-writecat(1322,45409
-writesubs(1351,46455
-writesups(1361,46757
-writelistsubs(1371,47090
-pp_lam(1380,47408
-pp_lam_bracket(1398,48022
-pp_lam_paren(1407,48338
-pp_rule(1429,49238
-member(1447,49866
-append_list(1451,49919
-append(1456,50010
-at_least_one_member(1460,50076
-numbervars(1464,50171
-reverse(1467,50209
-select(1471,50290
-select_last(1475,50357
-cat_atoms(1479,50436
-writelist(1485,50524
-write_lex_cat(1492,50676
-writebreaklex(1500,50988
-write_lex(1513,51265
-writebreak(1521,51541
-tt:-tt
1531,51713
-mt:-mt
1534,51784
-cmt:-cmt
1537,51878
+build(378,11967
+buildact(392,12523
+mapsyn(412,13544
+add_edge(434,14280
+findcats(447,14760
+normalize_tree(465,15480
+normalize_trees(475,15858
+expandmng_tree(486,16250
+expandmng_trees(496,16616
+cat(511,17015
+subtree(644,21268
+hypothetical_mem(653,21567
+make_coor(667,22132
+start_up:-start_up
688,23015
+tokenizeatom(710,23923
+tokenize(720,24350
+isoperator(752,25379
+isoptab(756,25433
+specialsymbol(765,25758
+sstab(771,25863
+parse_cgi(787,26349
+keyvalseq(792,26512
+andkeyvalseq(796,26611
+keyval(799,26690
+valseq(807,26922
+plusvalseq(810,27009
+val(816,27111
+argvals(824,27428
+commaargvals(828,27505
+atomval(833,27580
+atom(836,27642
+action(846,28006
+keyvalcgi(864,28651
+keyvalscgi(865,28672
+outsyn(868,28728
+act(876,29062
+actout(901,29908
+texttreelist(912,30091
+htmltreelist(918,30192
+fitchtreelist(924,30306
+pp_html_table_tree(938,30761
+pp_html_tree(949,31115
+pp_html_trees(988,32383
+pp_html_table_fitch_tree(999,32771
+pp_html_fitch_tree(1017,33674
+removeexp(1129,39004
+splitexp(1142,39492
+pp_exp(1155,39992
+map_word(1168,40251
+pp_exps(1180,40476
+pp_tree(1188,40779
+pp_trees(1216,41809
+pp_word_list(1225,42130
+pp_word(1231,42264
+pp_word_list_rest(1238,42571
+pp_cat(1248,42931
+pp_syn(1255,43198
+pp_syn_paren(1276,43901
+pp_paren(1293,44379
+pp_syn_back(1300,44663
+pp_bas_cat(1311,45003
+writecat(1322,45411
+writesubs(1351,46457
+writesups(1361,46759
+writelistsubs(1371,47092
+pp_lam(1380,47410
+pp_lam_bracket(1398,48024
+pp_lam_paren(1407,48340
+pp_rule(1429,49240
+member(1447,49868
+append_list(1451,49921
+append(1456,50012
+at_least_one_member(1460,50078
+numbervars(1464,50173
+reverse(1467,50211
+select(1471,50292
+select_last(1475,50359
+cat_atoms(1479,50438
+writelist(1485,50526
+write_lex_cat(1492,50678
+writebreaklex(1500,50990
+write_lex(1513,51267
+writebreak(1521,51543
+tt:-tt
1531,51715
+mt:-mt
1534,51786
+cmt:-cmt
1537,51880
 
 pyt-src/server.py,1438
 class Controls:Controls
17,358
@@ -3921,60 +3921,60 @@ merc-src/accumulator.m,3228
 :- func initialize_goal_store570,22060
 :- pred accu_store580,22421
 :- pred identify_recursive_calls601,23288
-:- pred identify_out_and_out_prime626,24396
-:- type accu_sets676,26425
-:- pred accu_stage1689,26977
-:- pred accu_stage1_2727,28347
-:- pred accu_sets_init781,30557
-:- func set_upto796,30984
-:- pred accu_before812,31498
-:- pred accu_assoc835,32477
-:- pred accu_construct862,33712
-:- pred accu_construct_assoc896,35307
-:- pred accu_update938,37069
-:- pred member_lessthan_goalid964,38219
-:- type accu_assoc975,38652
-:- pred accu_is_associative986,39138
-:- pred associativity_assertion1014,40263
-:- pred commutativity_assertion1037,41242
-:- pred accu_is_update1057,41952
-:- pred is_associative_construction1078,42802
-:- type accu_substs1095,43480
-:- type accu_base1103,43744
-:- pred accu_stage21124,44605
-:- pred accu_substs_init1179,46957
-:- pred acc_var_subst_init1194,47573
-:- pred create_new_var1207,48147
-:- pred accu_process_assoc_set1223,48862
-:- pred accu_has_heuristic1297,52081
-:- pred accu_heuristic1304,52336
-:- pred accu_process_update_set1318,52906
-:- pred accu_divide_base_case1380,55844
-:- pred accu_related1412,57146
-:- inst stored_goal_plain_call1444,58415
-:- pred lookup_call1449,58601
-:- pred accu_stage31470,59432
-:- pred acc_proc_info1508,61326
-:- pred acc_pred_info1556,63449
-:- pred accu_create_goal1600,65285
-:- func create_acc_call1621,66400
-:- pred create_orig_goal1634,66987
-:- pred create_acc_goal1662,68157
-:- func create_new_orig_recursive_goals1709,70225
-:- func create_new_recursive_goals1723,70918
-:- func create_new_base_goals1738,71717
-:- pred acc_unification1749,72156
-:- pred accu_top_level1766,72896
-:- pred update_accumulator_pred1856,76290
-:- func accu_rename1876,77253
-:- func base_case_ids1889,77784
-:- func base_case_ids_set1898,78048
-:- func accu_goal_list1905,78269
-:- pred calculate_goal_info1916,78680
-:- func chain_subst1932,79319
-:- pred chain_subst_21938,79482
-:- some [T] pred unravel_univ1956,80060
-:- pragma foreign_export1957,80116
+:- pred identify_out_and_out_prime626,24397
+:- type accu_sets676,26426
+:- pred accu_stage1689,26978
+:- pred accu_stage1_2727,28348
+:- pred accu_sets_init781,30558
+:- func set_upto796,30985
+:- pred accu_before812,31499
+:- pred accu_assoc835,32478
+:- pred accu_construct862,33713
+:- pred accu_construct_assoc896,35308
+:- pred accu_update938,37070
+:- pred member_lessthan_goalid964,38220
+:- type accu_assoc975,38653
+:- pred accu_is_associative986,39139
+:- pred associativity_assertion1014,40264
+:- pred commutativity_assertion1037,41243
+:- pred accu_is_update1057,41953
+:- pred is_associative_construction1078,42803
+:- type accu_substs1095,43481
+:- type accu_base1103,43745
+:- pred accu_stage21124,44606
+:- pred accu_substs_init1179,46958
+:- pred acc_var_subst_init1194,47574
+:- pred create_new_var1207,48148
+:- pred accu_process_assoc_set1223,48863
+:- pred accu_has_heuristic1297,52082
+:- pred accu_heuristic1304,52337
+:- pred accu_process_update_set1318,52907
+:- pred accu_divide_base_case1380,55845
+:- pred accu_related1412,57147
+:- inst stored_goal_plain_call1444,58416
+:- pred lookup_call1449,58602
+:- pred accu_stage31470,59433
+:- pred acc_proc_info1508,61327
+:- pred acc_pred_info1556,63450
+:- pred accu_create_goal1600,65286
+:- func create_acc_call1621,66401
+:- pred create_orig_goal1634,66988
+:- pred create_acc_goal1662,68158
+:- func create_new_orig_recursive_goals1709,70226
+:- func create_new_recursive_goals1723,70919
+:- func create_new_base_goals1738,71718
+:- pred acc_unification1749,72157
+:- pred accu_top_level1766,72897
+:- pred update_accumulator_pred1856,76291
+:- func accu_rename1876,77254
+:- func base_case_ids1889,77785
+:- func base_case_ids_set1898,78049
+:- func accu_goal_list1905,78270
+:- pred calculate_goal_info1916,78681
+:- func chain_subst1932,79320
+:- pred chain_subst_21938,79483
+:- some [T] pred unravel_univ1956,80061
+:- pragma foreign_export1957,80117
 
 c-src/c.c,76
 T f(1,0
diff --git a/test/manual/etags/ETAGS.good_2 b/test/manual/etags/ETAGS.good_2
index 3c611dc8ef5..6e90f1e8e05 100644
--- a/test/manual/etags/ETAGS.good_2
+++ b/test/manual/etags/ETAGS.good_2
@@ -3514,92 +3514,92 @@ complete(328,10055
 add_active(340,10527
 parse(353,10949
 derived_analyses(364,11341
-build(378,11965
-buildact(392,12521
-mapsyn(412,13542
-add_edge(434,14278
-findcats(447,14758
-normalize_tree(465,15478
-normalize_trees(475,15856
-expandmng_tree(486,16248
-expandmng_trees(496,16614
-cat(511,17013
-subtree(644,21266
-hypothetical_mem(653,21565
-make_coor(667,22130
-start_up:-start_up
688,23013
-tokenizeatom(710,23921
-tokenize(720,24348
-isoperator(752,25377
-isoptab(756,25431
-specialsymbol(765,25756
-sstab(771,25861
-parse_cgi(787,26347
-keyvalseq(792,26510
-andkeyvalseq(796,26609
-keyval(799,26688
-valseq(807,26920
-plusvalseq(810,27007
-val(816,27109
-argvals(824,27426
-commaargvals(828,27503
-atomval(833,27578
-atom(836,27640
-action(846,28004
-keyvalcgi(864,28649
-keyvalscgi(865,28670
-outsyn(868,28726
-act(876,29060
-actout(901,29906
-texttreelist(912,30089
-htmltreelist(918,30190
-fitchtreelist(924,30304
-pp_html_table_tree(938,30759
-pp_html_tree(949,31113
-pp_html_trees(988,32381
-pp_html_table_fitch_tree(999,32769
-pp_html_fitch_tree(1017,33672
-removeexp(1129,39002
-splitexp(1142,39490
-pp_exp(1155,39990
-map_word(1168,40249
-pp_exps(1180,40474
-pp_tree(1188,40777
-pp_trees(1216,41807
-pp_word_list(1225,42128
-pp_word(1231,42262
-pp_word_list_rest(1238,42569
-pp_cat(1248,42929
-pp_syn(1255,43196
-pp_syn_paren(1276,43899
-pp_paren(1293,44377
-pp_syn_back(1300,44661
-pp_bas_cat(1311,45001
-writecat(1322,45409
-writesubs(1351,46455
-writesups(1361,46757
-writelistsubs(1371,47090
-pp_lam(1380,47408
-pp_lam_bracket(1398,48022
-pp_lam_paren(1407,48338
-pp_rule(1429,49238
-member(1447,49866
-append_list(1451,49919
-append(1456,50010
-at_least_one_member(1460,50076
-numbervars(1464,50171
-reverse(1467,50209
-select(1471,50290
-select_last(1475,50357
-cat_atoms(1479,50436
-writelist(1485,50524
-write_lex_cat(1492,50676
-writebreaklex(1500,50988
-write_lex(1513,51265
-writebreak(1521,51541
-tt:-tt
1531,51713
-mt:-mt
1534,51784
-cmt:-cmt
1537,51878
+build(378,11967
+buildact(392,12523
+mapsyn(412,13544
+add_edge(434,14280
+findcats(447,14760
+normalize_tree(465,15480
+normalize_trees(475,15858
+expandmng_tree(486,16250
+expandmng_trees(496,16616
+cat(511,17015
+subtree(644,21268
+hypothetical_mem(653,21567
+make_coor(667,22132
+start_up:-start_up
688,23015
+tokenizeatom(710,23923
+tokenize(720,24350
+isoperator(752,25379
+isoptab(756,25433
+specialsymbol(765,25758
+sstab(771,25863
+parse_cgi(787,26349
+keyvalseq(792,26512
+andkeyvalseq(796,26611
+keyval(799,26690
+valseq(807,26922
+plusvalseq(810,27009
+val(816,27111
+argvals(824,27428
+commaargvals(828,27505
+atomval(833,27580
+atom(836,27642
+action(846,28006
+keyvalcgi(864,28651
+keyvalscgi(865,28672
+outsyn(868,28728
+act(876,29062
+actout(901,29908
+texttreelist(912,30091
+htmltreelist(918,30192
+fitchtreelist(924,30306
+pp_html_table_tree(938,30761
+pp_html_tree(949,31115
+pp_html_trees(988,32383
+pp_html_table_fitch_tree(999,32771
+pp_html_fitch_tree(1017,33674
+removeexp(1129,39004
+splitexp(1142,39492
+pp_exp(1155,39992
+map_word(1168,40251
+pp_exps(1180,40476
+pp_tree(1188,40779
+pp_trees(1216,41809
+pp_word_list(1225,42130
+pp_word(1231,42264
+pp_word_list_rest(1238,42571
+pp_cat(1248,42931
+pp_syn(1255,43198
+pp_syn_paren(1276,43901
+pp_paren(1293,44379
+pp_syn_back(1300,44663
+pp_bas_cat(1311,45003
+writecat(1322,45411
+writesubs(1351,46457
+writesups(1361,46759
+writelistsubs(1371,47092
+pp_lam(1380,47410
+pp_lam_bracket(1398,48024
+pp_lam_paren(1407,48340
+pp_rule(1429,49240
+member(1447,49868
+append_list(1451,49921
+append(1456,50012
+at_least_one_member(1460,50078
+numbervars(1464,50173
+reverse(1467,50211
+select(1471,50292
+select_last(1475,50359
+cat_atoms(1479,50438
+writelist(1485,50526
+write_lex_cat(1492,50678
+writebreaklex(1500,50990
+write_lex(1513,51267
+writebreak(1521,51543
+tt:-tt
1531,51715
+mt:-mt
1534,51786
+cmt:-cmt
1537,51880
 
 pyt-src/server.py,1438
 class Controls:Controls
17,358
@@ -4505,108 +4505,108 @@ initialize_goal_store573,22166
 accu_store584,22576
 :- pred identify_recursive_calls601,23288
 identify_recursive_calls604,23406
-:- pred identify_out_and_out_prime626,24396
-identify_out_and_out_prime631,24631
-:- type accu_sets676,26425
-:- pred accu_stage1689,26977
-accu_stage1693,27155
-:- pred accu_stage1_2727,28347
-accu_stage1_2731,28515
-:- pred accu_sets_init781,30557
-accu_sets_init783,30605
-:- func set_upto796,30984
-set_upto798,31039
-:- pred accu_before812,31498
-accu_before815,31639
-:- pred accu_assoc835,32477
-accu_assoc838,32617
-:- pred accu_construct862,33712
-accu_construct865,33856
-:- pred accu_construct_assoc896,35307
-accu_construct_assoc899,35457
-:- pred accu_update938,37069
-accu_update941,37210
-:- pred member_lessthan_goalid964,38219
-member_lessthan_goalid967,38342
-:- type accu_assoc975,38652
-:- pred accu_is_associative986,39138
-accu_is_associative989,39250
-:- pred associativity_assertion1014,40263
-associativity_assertion1017,40404
-:- pred commutativity_assertion1037,41242
-commutativity_assertion1040,41369
-:- pred accu_is_update1057,41952
-accu_is_update1060,42066
-:- pred is_associative_construction1078,42802
-is_associative_construction1081,42898
-:- type accu_substs1095,43480
-:- type accu_base1103,43744
-:- pred accu_stage21124,44605
-accu_stage21131,44946
-:- pred accu_substs_init1179,46957
-accu_substs_init1182,47097
-:- pred acc_var_subst_init1194,47573
-acc_var_subst_init1198,47718
-:- pred create_new_var1207,48147
-create_new_var1210,48288
-:- pred accu_process_assoc_set1223,48862
-accu_process_assoc_set1229,49150
-:- pred accu_has_heuristic1297,52081
-accu_has_heuristic1299,52161
-:- pred accu_heuristic1304,52336
-accu_heuristic1307,52457
-:- pred accu_process_update_set1318,52906
-accu_process_update_set1325,53221
-:- pred accu_divide_base_case1380,55844
-accu_divide_base_case1385,56059
-:- pred accu_related1412,57146
-accu_related1415,57270
-:- inst stored_goal_plain_call1444,58415
-:- pred lookup_call1449,58601
-lookup_call1452,58715
-:- pred accu_stage31470,59432
-accu_stage31477,59826
-:- pred acc_proc_info1508,61326
-acc_proc_info1512,61485
-:- pred acc_pred_info1556,63449
-acc_pred_info1559,63597
-:- pred accu_create_goal1600,65285
-accu_create_goal1607,65628
-:- func create_acc_call1621,66400
-create_acc_call1625,66569
-:- pred create_orig_goal1634,66987
-create_orig_goal1638,67176
-:- pred create_acc_goal1662,68157
-create_acc_goal1667,68380
-:- func create_new_orig_recursive_goals1709,70225
-create_new_orig_recursive_goals1712,70368
-:- func create_new_recursive_goals1723,70918
-create_new_recursive_goals1727,71108
-:- func create_new_base_goals1738,71717
-create_new_base_goals1741,71831
-:- pred acc_unification1749,72156
-acc_unification1751,72225
-:- pred accu_top_level1766,72896
-accu_top_level1770,73058
-:- pred update_accumulator_pred1856,76290
-update_accumulator_pred1859,76411
-:- func accu_rename1876,77253
-accu_rename1879,77363
-:- func base_case_ids1889,77784
-base_case_ids1891,77846
-:- func base_case_ids_set1898,78048
-base_case_ids_set1900,78113
-:- func accu_goal_list1905,78269
-accu_goal_list1907,78349
-:- pred calculate_goal_info1916,78680
-calculate_goal_info1918,78753
-:- func chain_subst1932,79319
-chain_subst1934,79378
-:- pred chain_subst_21938,79482
-chain_subst_21941,79576
-:- some [T] pred unravel_univ1956,80060
-:- pragma foreign_export1957,80116
-unravel_univ1961,80340
+:- pred identify_out_and_out_prime626,24397
+identify_out_and_out_prime631,24632
+:- type accu_sets676,26426
+:- pred accu_stage1689,26978
+accu_stage1693,27156
+:- pred accu_stage1_2727,28348
+accu_stage1_2731,28516
+:- pred accu_sets_init781,30558
+accu_sets_init783,30606
+:- func set_upto796,30985
+set_upto798,31040
+:- pred accu_before812,31499
+accu_before815,31640
+:- pred accu_assoc835,32478
+accu_assoc838,32618
+:- pred accu_construct862,33713
+accu_construct865,33857
+:- pred accu_construct_assoc896,35308
+accu_construct_assoc899,35458
+:- pred accu_update938,37070
+accu_update941,37211
+:- pred member_lessthan_goalid964,38220
+member_lessthan_goalid967,38343
+:- type accu_assoc975,38653
+:- pred accu_is_associative986,39139
+accu_is_associative989,39251
+:- pred associativity_assertion1014,40264
+associativity_assertion1017,40405
+:- pred commutativity_assertion1037,41243
+commutativity_assertion1040,41370
+:- pred accu_is_update1057,41953
+accu_is_update1060,42067
+:- pred is_associative_construction1078,42803
+is_associative_construction1081,42899
+:- type accu_substs1095,43481
+:- type accu_base1103,43745
+:- pred accu_stage21124,44606
+accu_stage21131,44947
+:- pred accu_substs_init1179,46958
+accu_substs_init1182,47098
+:- pred acc_var_subst_init1194,47574
+acc_var_subst_init1198,47719
+:- pred create_new_var1207,48148
+create_new_var1210,48289
+:- pred accu_process_assoc_set1223,48863
+accu_process_assoc_set1229,49151
+:- pred accu_has_heuristic1297,52082
+accu_has_heuristic1299,52162
+:- pred accu_heuristic1304,52337
+accu_heuristic1307,52458
+:- pred accu_process_update_set1318,52907
+accu_process_update_set1325,53222
+:- pred accu_divide_base_case1380,55845
+accu_divide_base_case1385,56060
+:- pred accu_related1412,57147
+accu_related1415,57271
+:- inst stored_goal_plain_call1444,58416
+:- pred lookup_call1449,58602
+lookup_call1452,58716
+:- pred accu_stage31470,59433
+accu_stage31477,59827
+:- pred acc_proc_info1508,61327
+acc_proc_info1512,61486
+:- pred acc_pred_info1556,63450
+acc_pred_info1559,63598
+:- pred accu_create_goal1600,65286
+accu_create_goal1607,65629
+:- func create_acc_call1621,66401
+create_acc_call1625,66570
+:- pred create_orig_goal1634,66988
+create_orig_goal1638,67177
+:- pred create_acc_goal1662,68158
+create_acc_goal1667,68381
+:- func create_new_orig_recursive_goals1709,70226
+create_new_orig_recursive_goals1712,70369
+:- func create_new_recursive_goals1723,70919
+create_new_recursive_goals1727,71109
+:- func create_new_base_goals1738,71718
+create_new_base_goals1741,71832
+:- pred acc_unification1749,72157
+acc_unification1751,72226
+:- pred accu_top_level1766,72897
+accu_top_level1770,73059
+:- pred update_accumulator_pred1856,76291
+update_accumulator_pred1859,76412
+:- func accu_rename1876,77254
+accu_rename1879,77364
+:- func base_case_ids1889,77785
+base_case_ids1891,77847
+:- func base_case_ids_set1898,78049
+base_case_ids_set1900,78114
+:- func accu_goal_list1905,78270
+accu_goal_list1907,78350
+:- pred calculate_goal_info1916,78681
+calculate_goal_info1918,78754
+:- func chain_subst1932,79320
+chain_subst1934,79379
+:- pred chain_subst_21938,79483
+chain_subst_21941,79577
+:- some [T] pred unravel_univ1956,80061
+:- pragma foreign_export1957,80117
+unravel_univ1961,80341
 
 c-src/c.c,76
 T f(1,0
diff --git a/test/manual/etags/ETAGS.good_3 b/test/manual/etags/ETAGS.good_3
index 45507706b32..15ed7855b30 100644
--- a/test/manual/etags/ETAGS.good_3
+++ b/test/manual/etags/ETAGS.good_3
@@ -3348,92 +3348,92 @@ complete(328,10055
 add_active(340,10527
 parse(353,10949
 derived_analyses(364,11341
-build(378,11965
-buildact(392,12521
-mapsyn(412,13542
-add_edge(434,14278
-findcats(447,14758
-normalize_tree(465,15478
-normalize_trees(475,15856
-expandmng_tree(486,16248
-expandmng_trees(496,16614
-cat(511,17013
-subtree(644,21266
-hypothetical_mem(653,21565
-make_coor(667,22130
-start_up:-start_up
688,23013
-tokenizeatom(710,23921
-tokenize(720,24348
-isoperator(752,25377
-isoptab(756,25431
-specialsymbol(765,25756
-sstab(771,25861
-parse_cgi(787,26347
-keyvalseq(792,26510
-andkeyvalseq(796,26609
-keyval(799,26688
-valseq(807,26920
-plusvalseq(810,27007
-val(816,27109
-argvals(824,27426
-commaargvals(828,27503
-atomval(833,27578
-atom(836,27640
-action(846,28004
-keyvalcgi(864,28649
-keyvalscgi(865,28670
-outsyn(868,28726
-act(876,29060
-actout(901,29906
-texttreelist(912,30089
-htmltreelist(918,30190
-fitchtreelist(924,30304
-pp_html_table_tree(938,30759
-pp_html_tree(949,31113
-pp_html_trees(988,32381
-pp_html_table_fitch_tree(999,32769
-pp_html_fitch_tree(1017,33672
-removeexp(1129,39002
-splitexp(1142,39490
-pp_exp(1155,39990
-map_word(1168,40249
-pp_exps(1180,40474
-pp_tree(1188,40777
-pp_trees(1216,41807
-pp_word_list(1225,42128
-pp_word(1231,42262
-pp_word_list_rest(1238,42569
-pp_cat(1248,42929
-pp_syn(1255,43196
-pp_syn_paren(1276,43899
-pp_paren(1293,44377
-pp_syn_back(1300,44661
-pp_bas_cat(1311,45001
-writecat(1322,45409
-writesubs(1351,46455
-writesups(1361,46757
-writelistsubs(1371,47090
-pp_lam(1380,47408
-pp_lam_bracket(1398,48022
-pp_lam_paren(1407,48338
-pp_rule(1429,49238
-member(1447,49866
-append_list(1451,49919
-append(1456,50010
-at_least_one_member(1460,50076
-numbervars(1464,50171
-reverse(1467,50209
-select(1471,50290
-select_last(1475,50357
-cat_atoms(1479,50436
-writelist(1485,50524
-write_lex_cat(1492,50676
-writebreaklex(1500,50988
-write_lex(1513,51265
-writebreak(1521,51541
-tt:-tt
1531,51713
-mt:-mt
1534,51784
-cmt:-cmt
1537,51878
+build(378,11967
+buildact(392,12523
+mapsyn(412,13544
+add_edge(434,14280
+findcats(447,14760
+normalize_tree(465,15480
+normalize_trees(475,15858
+expandmng_tree(486,16250
+expandmng_trees(496,16616
+cat(511,17015
+subtree(644,21268
+hypothetical_mem(653,21567
+make_coor(667,22132
+start_up:-start_up
688,23015
+tokenizeatom(710,23923
+tokenize(720,24350
+isoperator(752,25379
+isoptab(756,25433
+specialsymbol(765,25758
+sstab(771,25863
+parse_cgi(787,26349
+keyvalseq(792,26512
+andkeyvalseq(796,26611
+keyval(799,26690
+valseq(807,26922
+plusvalseq(810,27009
+val(816,27111
+argvals(824,27428
+commaargvals(828,27505
+atomval(833,27580
+atom(836,27642
+action(846,28006
+keyvalcgi(864,28651
+keyvalscgi(865,28672
+outsyn(868,28728
+act(876,29062
+actout(901,29908
+texttreelist(912,30091
+htmltreelist(918,30192
+fitchtreelist(924,30306
+pp_html_table_tree(938,30761
+pp_html_tree(949,31115
+pp_html_trees(988,32383
+pp_html_table_fitch_tree(999,32771
+pp_html_fitch_tree(1017,33674
+removeexp(1129,39004
+splitexp(1142,39492
+pp_exp(1155,39992
+map_word(1168,40251
+pp_exps(1180,40476
+pp_tree(1188,40779
+pp_trees(1216,41809
+pp_word_list(1225,42130
+pp_word(1231,42264
+pp_word_list_rest(1238,42571
+pp_cat(1248,42931
+pp_syn(1255,43198
+pp_syn_paren(1276,43901
+pp_paren(1293,44379
+pp_syn_back(1300,44663
+pp_bas_cat(1311,45003
+writecat(1322,45411
+writesubs(1351,46457
+writesups(1361,46759
+writelistsubs(1371,47092
+pp_lam(1380,47410
+pp_lam_bracket(1398,48024
+pp_lam_paren(1407,48340
+pp_rule(1429,49240
+member(1447,49868
+append_list(1451,49921
+append(1456,50012
+at_least_one_member(1460,50078
+numbervars(1464,50173
+reverse(1467,50211
+select(1471,50292
+select_last(1475,50359
+cat_atoms(1479,50438
+writelist(1485,50526
+write_lex_cat(1492,50678
+writebreaklex(1500,50990
+write_lex(1513,51267
+writebreak(1521,51543
+tt:-tt
1531,51715
+mt:-mt
1534,51786
+cmt:-cmt
1537,51880
 
 pyt-src/server.py,1438
 class Controls:Controls
17,358
@@ -4328,60 +4328,60 @@ merc-src/accumulator.m,3228
 :- func initialize_goal_store570,22060
 :- pred accu_store580,22421
 :- pred identify_recursive_calls601,23288
-:- pred identify_out_and_out_prime626,24396
-:- type accu_sets676,26425
-:- pred accu_stage1689,26977
-:- pred accu_stage1_2727,28347
-:- pred accu_sets_init781,30557
-:- func set_upto796,30984
-:- pred accu_before812,31498
-:- pred accu_assoc835,32477
-:- pred accu_construct862,33712
-:- pred accu_construct_assoc896,35307
-:- pred accu_update938,37069
-:- pred member_lessthan_goalid964,38219
-:- type accu_assoc975,38652
-:- pred accu_is_associative986,39138
-:- pred associativity_assertion1014,40263
-:- pred commutativity_assertion1037,41242
-:- pred accu_is_update1057,41952
-:- pred is_associative_construction1078,42802
-:- type accu_substs1095,43480
-:- type accu_base1103,43744
-:- pred accu_stage21124,44605
-:- pred accu_substs_init1179,46957
-:- pred acc_var_subst_init1194,47573
-:- pred create_new_var1207,48147
-:- pred accu_process_assoc_set1223,48862
-:- pred accu_has_heuristic1297,52081
-:- pred accu_heuristic1304,52336
-:- pred accu_process_update_set1318,52906
-:- pred accu_divide_base_case1380,55844
-:- pred accu_related1412,57146
-:- inst stored_goal_plain_call1444,58415
-:- pred lookup_call1449,58601
-:- pred accu_stage31470,59432
-:- pred acc_proc_info1508,61326
-:- pred acc_pred_info1556,63449
-:- pred accu_create_goal1600,65285
-:- func create_acc_call1621,66400
-:- pred create_orig_goal1634,66987
-:- pred create_acc_goal1662,68157
-:- func create_new_orig_recursive_goals1709,70225
-:- func create_new_recursive_goals1723,70918
-:- func create_new_base_goals1738,71717
-:- pred acc_unification1749,72156
-:- pred accu_top_level1766,72896
-:- pred update_accumulator_pred1856,76290
-:- func accu_rename1876,77253
-:- func base_case_ids1889,77784
-:- func base_case_ids_set1898,78048
-:- func accu_goal_list1905,78269
-:- pred calculate_goal_info1916,78680
-:- func chain_subst1932,79319
-:- pred chain_subst_21938,79482
-:- some [T] pred unravel_univ1956,80060
-:- pragma foreign_export1957,80116
+:- pred identify_out_and_out_prime626,24397
+:- type accu_sets676,26426
+:- pred accu_stage1689,26978
+:- pred accu_stage1_2727,28348
+:- pred accu_sets_init781,30558
+:- func set_upto796,30985
+:- pred accu_before812,31499
+:- pred accu_assoc835,32478
+:- pred accu_construct862,33713
+:- pred accu_construct_assoc896,35308
+:- pred accu_update938,37070
+:- pred member_lessthan_goalid964,38220
+:- type accu_assoc975,38653
+:- pred accu_is_associative986,39139
+:- pred associativity_assertion1014,40264
+:- pred commutativity_assertion1037,41243
+:- pred accu_is_update1057,41953
+:- pred is_associative_construction1078,42803
+:- type accu_substs1095,43481
+:- type accu_base1103,43745
+:- pred accu_stage21124,44606
+:- pred accu_substs_init1179,46958
+:- pred acc_var_subst_init1194,47574
+:- pred create_new_var1207,48148
+:- pred accu_process_assoc_set1223,48863
+:- pred accu_has_heuristic1297,52082
+:- pred accu_heuristic1304,52337
+:- pred accu_process_update_set1318,52907
+:- pred accu_divide_base_case1380,55845
+:- pred accu_related1412,57147
+:- inst stored_goal_plain_call1444,58416
+:- pred lookup_call1449,58602
+:- pred accu_stage31470,59433
+:- pred acc_proc_info1508,61327
+:- pred acc_pred_info1556,63450
+:- pred accu_create_goal1600,65286
+:- func create_acc_call1621,66401
+:- pred create_orig_goal1634,66988
+:- pred create_acc_goal1662,68158
+:- func create_new_orig_recursive_goals1709,70226
+:- func create_new_recursive_goals1723,70919
+:- func create_new_base_goals1738,71718
+:- pred acc_unification1749,72157
+:- pred accu_top_level1766,72897
+:- pred update_accumulator_pred1856,76291
+:- func accu_rename1876,77254
+:- func base_case_ids1889,77785
+:- func base_case_ids_set1898,78049
+:- func accu_goal_list1905,78270
+:- pred calculate_goal_info1916,78681
+:- func chain_subst1932,79320
+:- pred chain_subst_21938,79483
+:- some [T] pred unravel_univ1956,80061
+:- pragma foreign_export1957,80117
 
 c-src/c.c,76
 T f(1,0
diff --git a/test/manual/etags/ETAGS.good_4 b/test/manual/etags/ETAGS.good_4
index dee534ae753..dc65a09fdc2 100644
--- a/test/manual/etags/ETAGS.good_4
+++ b/test/manual/etags/ETAGS.good_4
@@ -3103,92 +3103,92 @@ complete(328,10055
 add_active(340,10527
 parse(353,10949
 derived_analyses(364,11341
-build(378,11965
-buildact(392,12521
-mapsyn(412,13542
-add_edge(434,14278
-findcats(447,14758
-normalize_tree(465,15478
-normalize_trees(475,15856
-expandmng_tree(486,16248
-expandmng_trees(496,16614
-cat(511,17013
-subtree(644,21266
-hypothetical_mem(653,21565
-make_coor(667,22130
-start_up:-start_up
688,23013
-tokenizeatom(710,23921
-tokenize(720,24348
-isoperator(752,25377
-isoptab(756,25431
-specialsymbol(765,25756
-sstab(771,25861
-parse_cgi(787,26347
-keyvalseq(792,26510
-andkeyvalseq(796,26609
-keyval(799,26688
-valseq(807,26920
-plusvalseq(810,27007
-val(816,27109
-argvals(824,27426
-commaargvals(828,27503
-atomval(833,27578
-atom(836,27640
-action(846,28004
-keyvalcgi(864,28649
-keyvalscgi(865,28670
-outsyn(868,28726
-act(876,29060
-actout(901,29906
-texttreelist(912,30089
-htmltreelist(918,30190
-fitchtreelist(924,30304
-pp_html_table_tree(938,30759
-pp_html_tree(949,31113
-pp_html_trees(988,32381
-pp_html_table_fitch_tree(999,32769
-pp_html_fitch_tree(1017,33672
-removeexp(1129,39002
-splitexp(1142,39490
-pp_exp(1155,39990
-map_word(1168,40249
-pp_exps(1180,40474
-pp_tree(1188,40777
-pp_trees(1216,41807
-pp_word_list(1225,42128
-pp_word(1231,42262
-pp_word_list_rest(1238,42569
-pp_cat(1248,42929
-pp_syn(1255,43196
-pp_syn_paren(1276,43899
-pp_paren(1293,44377
-pp_syn_back(1300,44661
-pp_bas_cat(1311,45001
-writecat(1322,45409
-writesubs(1351,46455
-writesups(1361,46757
-writelistsubs(1371,47090
-pp_lam(1380,47408
-pp_lam_bracket(1398,48022
-pp_lam_paren(1407,48338
-pp_rule(1429,49238
-member(1447,49866
-append_list(1451,49919
-append(1456,50010
-at_least_one_member(1460,50076
-numbervars(1464,50171
-reverse(1467,50209
-select(1471,50290
-select_last(1475,50357
-cat_atoms(1479,50436
-writelist(1485,50524
-write_lex_cat(1492,50676
-writebreaklex(1500,50988
-write_lex(1513,51265
-writebreak(1521,51541
-tt:-tt
1531,51713
-mt:-mt
1534,51784
-cmt:-cmt
1537,51878
+build(378,11967
+buildact(392,12523
+mapsyn(412,13544
+add_edge(434,14280
+findcats(447,14760
+normalize_tree(465,15480
+normalize_trees(475,15858
+expandmng_tree(486,16250
+expandmng_trees(496,16616
+cat(511,17015
+subtree(644,21268
+hypothetical_mem(653,21567
+make_coor(667,22132
+start_up:-start_up
688,23015
+tokenizeatom(710,23923
+tokenize(720,24350
+isoperator(752,25379
+isoptab(756,25433
+specialsymbol(765,25758
+sstab(771,25863
+parse_cgi(787,26349
+keyvalseq(792,26512
+andkeyvalseq(796,26611
+keyval(799,26690
+valseq(807,26922
+plusvalseq(810,27009
+val(816,27111
+argvals(824,27428
+commaargvals(828,27505
+atomval(833,27580
+atom(836,27642
+action(846,28006
+keyvalcgi(864,28651
+keyvalscgi(865,28672
+outsyn(868,28728
+act(876,29062
+actout(901,29908
+texttreelist(912,30091
+htmltreelist(918,30192
+fitchtreelist(924,30306
+pp_html_table_tree(938,30761
+pp_html_tree(949,31115
+pp_html_trees(988,32383
+pp_html_table_fitch_tree(999,32771
+pp_html_fitch_tree(1017,33674
+removeexp(1129,39004
+splitexp(1142,39492
+pp_exp(1155,39992
+map_word(1168,40251
+pp_exps(1180,40476
+pp_tree(1188,40779
+pp_trees(1216,41809
+pp_word_list(1225,42130
+pp_word(1231,42264
+pp_word_list_rest(1238,42571
+pp_cat(1248,42931
+pp_syn(1255,43198
+pp_syn_paren(1276,43901
+pp_paren(1293,44379
+pp_syn_back(1300,44663
+pp_bas_cat(1311,45003
+writecat(1322,45411
+writesubs(1351,46457
+writesups(1361,46759
+writelistsubs(1371,47092
+pp_lam(1380,47410
+pp_lam_bracket(1398,48024
+pp_lam_paren(1407,48340
+pp_rule(1429,49240
+member(1447,49868
+append_list(1451,49921
+append(1456,50012
+at_least_one_member(1460,50078
+numbervars(1464,50173
+reverse(1467,50211
+select(1471,50292
+select_last(1475,50359
+cat_atoms(1479,50438
+writelist(1485,50526
+write_lex_cat(1492,50678
+writebreaklex(1500,50990
+write_lex(1513,51267
+writebreak(1521,51543
+tt:-tt
1531,51715
+mt:-mt
1534,51786
+cmt:-cmt
1537,51880
 
 pyt-src/server.py,1438
 class Controls:Controls
17,358
@@ -4083,60 +4083,60 @@ merc-src/accumulator.m,3228
 :- func initialize_goal_store570,22060
 :- pred accu_store580,22421
 :- pred identify_recursive_calls601,23288
-:- pred identify_out_and_out_prime626,24396
-:- type accu_sets676,26425
-:- pred accu_stage1689,26977
-:- pred accu_stage1_2727,28347
-:- pred accu_sets_init781,30557
-:- func set_upto796,30984
-:- pred accu_before812,31498
-:- pred accu_assoc835,32477
-:- pred accu_construct862,33712
-:- pred accu_construct_assoc896,35307
-:- pred accu_update938,37069
-:- pred member_lessthan_goalid964,38219
-:- type accu_assoc975,38652
-:- pred accu_is_associative986,39138
-:- pred associativity_assertion1014,40263
-:- pred commutativity_assertion1037,41242
-:- pred accu_is_update1057,41952
-:- pred is_associative_construction1078,42802
-:- type accu_substs1095,43480
-:- type accu_base1103,43744
-:- pred accu_stage21124,44605
-:- pred accu_substs_init1179,46957
-:- pred acc_var_subst_init1194,47573
-:- pred create_new_var1207,48147
-:- pred accu_process_assoc_set1223,48862
-:- pred accu_has_heuristic1297,52081
-:- pred accu_heuristic1304,52336
-:- pred accu_process_update_set1318,52906
-:- pred accu_divide_base_case1380,55844
-:- pred accu_related1412,57146
-:- inst stored_goal_plain_call1444,58415
-:- pred lookup_call1449,58601
-:- pred accu_stage31470,59432
-:- pred acc_proc_info1508,61326
-:- pred acc_pred_info1556,63449
-:- pred accu_create_goal1600,65285
-:- func create_acc_call1621,66400
-:- pred create_orig_goal1634,66987
-:- pred create_acc_goal1662,68157
-:- func create_new_orig_recursive_goals1709,70225
-:- func create_new_recursive_goals1723,70918
-:- func create_new_base_goals1738,71717
-:- pred acc_unification1749,72156
-:- pred accu_top_level1766,72896
-:- pred update_accumulator_pred1856,76290
-:- func accu_rename1876,77253
-:- func base_case_ids1889,77784
-:- func base_case_ids_set1898,78048
-:- func accu_goal_list1905,78269
-:- pred calculate_goal_info1916,78680
-:- func chain_subst1932,79319
-:- pred chain_subst_21938,79482
-:- some [T] pred unravel_univ1956,80060
-:- pragma foreign_export1957,80116
+:- pred identify_out_and_out_prime626,24397
+:- type accu_sets676,26426
+:- pred accu_stage1689,26978
+:- pred accu_stage1_2727,28348
+:- pred accu_sets_init781,30558
+:- func set_upto796,30985
+:- pred accu_before812,31499
+:- pred accu_assoc835,32478
+:- pred accu_construct862,33713
+:- pred accu_construct_assoc896,35308
+:- pred accu_update938,37070
+:- pred member_lessthan_goalid964,38220
+:- type accu_assoc975,38653
+:- pred accu_is_associative986,39139
+:- pred associativity_assertion1014,40264
+:- pred commutativity_assertion1037,41243
+:- pred accu_is_update1057,41953
+:- pred is_associative_construction1078,42803
+:- type accu_substs1095,43481
+:- type accu_base1103,43745
+:- pred accu_stage21124,44606
+:- pred accu_substs_init1179,46958
+:- pred acc_var_subst_init1194,47574
+:- pred create_new_var1207,48148
+:- pred accu_process_assoc_set1223,48863
+:- pred accu_has_heuristic1297,52082
+:- pred accu_heuristic1304,52337
+:- pred accu_process_update_set1318,52907
+:- pred accu_divide_base_case1380,55845
+:- pred accu_related1412,57147
+:- inst stored_goal_plain_call1444,58416
+:- pred lookup_call1449,58602
+:- pred accu_stage31470,59433
+:- pred acc_proc_info1508,61327
+:- pred acc_pred_info1556,63450
+:- pred accu_create_goal1600,65286
+:- func create_acc_call1621,66401
+:- pred create_orig_goal1634,66988
+:- pred create_acc_goal1662,68158
+:- func create_new_orig_recursive_goals1709,70226
+:- func create_new_recursive_goals1723,70919
+:- func create_new_base_goals1738,71718
+:- pred acc_unification1749,72157
+:- pred accu_top_level1766,72897
+:- pred update_accumulator_pred1856,76291
+:- func accu_rename1876,77254
+:- func base_case_ids1889,77785
+:- func base_case_ids_set1898,78049
+:- func accu_goal_list1905,78270
+:- pred calculate_goal_info1916,78681
+:- func chain_subst1932,79320
+:- pred chain_subst_21938,79483
+:- some [T] pred unravel_univ1956,80061
+:- pragma foreign_export1957,80117
 
 c-src/c.c,76
 T f(1,0
diff --git a/test/manual/etags/ETAGS.good_5 b/test/manual/etags/ETAGS.good_5
index 6410685cb30..3e238a50f38 100644
--- a/test/manual/etags/ETAGS.good_5
+++ b/test/manual/etags/ETAGS.good_5
@@ -4083,92 +4083,92 @@ complete(328,10055
 add_active(340,10527
 parse(353,10949
 derived_analyses(364,11341
-build(378,11965
-buildact(392,12521
-mapsyn(412,13542
-add_edge(434,14278
-findcats(447,14758
-normalize_tree(465,15478
-normalize_trees(475,15856
-expandmng_tree(486,16248
-expandmng_trees(496,16614
-cat(511,17013
-subtree(644,21266
-hypothetical_mem(653,21565
-make_coor(667,22130
-start_up:-start_up
688,23013
-tokenizeatom(710,23921
-tokenize(720,24348
-isoperator(752,25377
-isoptab(756,25431
-specialsymbol(765,25756
-sstab(771,25861
-parse_cgi(787,26347
-keyvalseq(792,26510
-andkeyvalseq(796,26609
-keyval(799,26688
-valseq(807,26920
-plusvalseq(810,27007
-val(816,27109
-argvals(824,27426
-commaargvals(828,27503
-atomval(833,27578
-atom(836,27640
-action(846,28004
-keyvalcgi(864,28649
-keyvalscgi(865,28670
-outsyn(868,28726
-act(876,29060
-actout(901,29906
-texttreelist(912,30089
-htmltreelist(918,30190
-fitchtreelist(924,30304
-pp_html_table_tree(938,30759
-pp_html_tree(949,31113
-pp_html_trees(988,32381
-pp_html_table_fitch_tree(999,32769
-pp_html_fitch_tree(1017,33672
-removeexp(1129,39002
-splitexp(1142,39490
-pp_exp(1155,39990
-map_word(1168,40249
-pp_exps(1180,40474
-pp_tree(1188,40777
-pp_trees(1216,41807
-pp_word_list(1225,42128
-pp_word(1231,42262
-pp_word_list_rest(1238,42569
-pp_cat(1248,42929
-pp_syn(1255,43196
-pp_syn_paren(1276,43899
-pp_paren(1293,44377
-pp_syn_back(1300,44661
-pp_bas_cat(1311,45001
-writecat(1322,45409
-writesubs(1351,46455
-writesups(1361,46757
-writelistsubs(1371,47090
-pp_lam(1380,47408
-pp_lam_bracket(1398,48022
-pp_lam_paren(1407,48338
-pp_rule(1429,49238
-member(1447,49866
-append_list(1451,49919
-append(1456,50010
-at_least_one_member(1460,50076
-numbervars(1464,50171
-reverse(1467,50209
-select(1471,50290
-select_last(1475,50357
-cat_atoms(1479,50436
-writelist(1485,50524
-write_lex_cat(1492,50676
-writebreaklex(1500,50988
-write_lex(1513,51265
-writebreak(1521,51541
-tt:-tt
1531,51713
-mt:-mt
1534,51784
-cmt:-cmt
1537,51878
+build(378,11967
+buildact(392,12523
+mapsyn(412,13544
+add_edge(434,14280
+findcats(447,14760
+normalize_tree(465,15480
+normalize_trees(475,15858
+expandmng_tree(486,16250
+expandmng_trees(496,16616
+cat(511,17015
+subtree(644,21268
+hypothetical_mem(653,21567
+make_coor(667,22132
+start_up:-start_up
688,23015
+tokenizeatom(710,23923
+tokenize(720,24350
+isoperator(752,25379
+isoptab(756,25433
+specialsymbol(765,25758
+sstab(771,25863
+parse_cgi(787,26349
+keyvalseq(792,26512
+andkeyvalseq(796,26611
+keyval(799,26690
+valseq(807,26922
+plusvalseq(810,27009
+val(816,27111
+argvals(824,27428
+commaargvals(828,27505
+atomval(833,27580
+atom(836,27642
+action(846,28006
+keyvalcgi(864,28651
+keyvalscgi(865,28672
+outsyn(868,28728
+act(876,29062
+actout(901,29908
+texttreelist(912,30091
+htmltreelist(918,30192
+fitchtreelist(924,30306
+pp_html_table_tree(938,30761
+pp_html_tree(949,31115
+pp_html_trees(988,32383
+pp_html_table_fitch_tree(999,32771
+pp_html_fitch_tree(1017,33674
+removeexp(1129,39004
+splitexp(1142,39492
+pp_exp(1155,39992
+map_word(1168,40251
+pp_exps(1180,40476
+pp_tree(1188,40779
+pp_trees(1216,41809
+pp_word_list(1225,42130
+pp_word(1231,42264
+pp_word_list_rest(1238,42571
+pp_cat(1248,42931
+pp_syn(1255,43198
+pp_syn_paren(1276,43901
+pp_paren(1293,44379
+pp_syn_back(1300,44663
+pp_bas_cat(1311,45003
+writecat(1322,45411
+writesubs(1351,46457
+writesups(1361,46759
+writelistsubs(1371,47092
+pp_lam(1380,47410
+pp_lam_bracket(1398,48024
+pp_lam_paren(1407,48340
+pp_rule(1429,49240
+member(1447,49868
+append_list(1451,49921
+append(1456,50012
+at_least_one_member(1460,50078
+numbervars(1464,50173
+reverse(1467,50211
+select(1471,50292
+select_last(1475,50359
+cat_atoms(1479,50438
+writelist(1485,50526
+write_lex_cat(1492,50678
+writebreaklex(1500,50990
+write_lex(1513,51267
+writebreak(1521,51543
+tt:-tt
1531,51715
+mt:-mt
1534,51786
+cmt:-cmt
1537,51880
 
 pyt-src/server.py,1438
 class Controls:Controls
17,358
@@ -5074,108 +5074,108 @@ initialize_goal_store573,22166
 accu_store584,22576
 :- pred identify_recursive_calls601,23288
 identify_recursive_calls604,23406
-:- pred identify_out_and_out_prime626,24396
-identify_out_and_out_prime631,24631
-:- type accu_sets676,26425
-:- pred accu_stage1689,26977
-accu_stage1693,27155
-:- pred accu_stage1_2727,28347
-accu_stage1_2731,28515
-:- pred accu_sets_init781,30557
-accu_sets_init783,30605
-:- func set_upto796,30984
-set_upto798,31039
-:- pred accu_before812,31498
-accu_before815,31639
-:- pred accu_assoc835,32477
-accu_assoc838,32617
-:- pred accu_construct862,33712
-accu_construct865,33856
-:- pred accu_construct_assoc896,35307
-accu_construct_assoc899,35457
-:- pred accu_update938,37069
-accu_update941,37210
-:- pred member_lessthan_goalid964,38219
-member_lessthan_goalid967,38342
-:- type accu_assoc975,38652
-:- pred accu_is_associative986,39138
-accu_is_associative989,39250
-:- pred associativity_assertion1014,40263
-associativity_assertion1017,40404
-:- pred commutativity_assertion1037,41242
-commutativity_assertion1040,41369
-:- pred accu_is_update1057,41952
-accu_is_update1060,42066
-:- pred is_associative_construction1078,42802
-is_associative_construction1081,42898
-:- type accu_substs1095,43480
-:- type accu_base1103,43744
-:- pred accu_stage21124,44605
-accu_stage21131,44946
-:- pred accu_substs_init1179,46957
-accu_substs_init1182,47097
-:- pred acc_var_subst_init1194,47573
-acc_var_subst_init1198,47718
-:- pred create_new_var1207,48147
-create_new_var1210,48288
-:- pred accu_process_assoc_set1223,48862
-accu_process_assoc_set1229,49150
-:- pred accu_has_heuristic1297,52081
-accu_has_heuristic1299,52161
-:- pred accu_heuristic1304,52336
-accu_heuristic1307,52457
-:- pred accu_process_update_set1318,52906
-accu_process_update_set1325,53221
-:- pred accu_divide_base_case1380,55844
-accu_divide_base_case1385,56059
-:- pred accu_related1412,57146
-accu_related1415,57270
-:- inst stored_goal_plain_call1444,58415
-:- pred lookup_call1449,58601
-lookup_call1452,58715
-:- pred accu_stage31470,59432
-accu_stage31477,59826
-:- pred acc_proc_info1508,61326
-acc_proc_info1512,61485
-:- pred acc_pred_info1556,63449
-acc_pred_info1559,63597
-:- pred accu_create_goal1600,65285
-accu_create_goal1607,65628
-:- func create_acc_call1621,66400
-create_acc_call1625,66569
-:- pred create_orig_goal1634,66987
-create_orig_goal1638,67176
-:- pred create_acc_goal1662,68157
-create_acc_goal1667,68380
-:- func create_new_orig_recursive_goals1709,70225
-create_new_orig_recursive_goals1712,70368
-:- func create_new_recursive_goals1723,70918
-create_new_recursive_goals1727,71108
-:- func create_new_base_goals1738,71717
-create_new_base_goals1741,71831
-:- pred acc_unification1749,72156
-acc_unification1751,72225
-:- pred accu_top_level1766,72896
-accu_top_level1770,73058
-:- pred update_accumulator_pred1856,76290
-update_accumulator_pred1859,76411
-:- func accu_rename1876,77253
-accu_rename1879,77363
-:- func base_case_ids1889,77784
-base_case_ids1891,77846
-:- func base_case_ids_set1898,78048
-base_case_ids_set1900,78113
-:- func accu_goal_list1905,78269
-accu_goal_list1907,78349
-:- pred calculate_goal_info1916,78680
-calculate_goal_info1918,78753
-:- func chain_subst1932,79319
-chain_subst1934,79378
-:- pred chain_subst_21938,79482
-chain_subst_21941,79576
-:- some [T] pred unravel_univ1956,80060
-:- pragma foreign_export1957,80116
-unravel_univ1961,80340
+:- pred identify_out_and_out_prime626,24397
+identify_out_and_out_prime631,24632
+:- type accu_sets676,26426
+:- pred accu_stage1689,26978
+accu_stage1693,27156
+:- pred accu_stage1_2727,28348
+accu_stage1_2731,28516
+:- pred accu_sets_init781,30558
+accu_sets_init783,30606
+:- func set_upto796,30985
+set_upto798,31040
+:- pred accu_before812,31499
+accu_before815,31640
+:- pred accu_assoc835,32478
+accu_assoc838,32618
+:- pred accu_construct862,33713
+accu_construct865,33857
+:- pred accu_construct_assoc896,35308
+accu_construct_assoc899,35458
+:- pred accu_update938,37070
+accu_update941,37211
+:- pred member_lessthan_goalid964,38220
+member_lessthan_goalid967,38343
+:- type accu_assoc975,38653
+:- pred accu_is_associative986,39139
+accu_is_associative989,39251
+:- pred associativity_assertion1014,40264
+associativity_assertion1017,40405
+:- pred commutativity_assertion1037,41243
+commutativity_assertion1040,41370
+:- pred accu_is_update1057,41953
+accu_is_update1060,42067
+:- pred is_associative_construction1078,42803
+is_associative_construction1081,42899
+:- type accu_substs1095,43481
+:- type accu_base1103,43745
+:- pred accu_stage21124,44606
+accu_stage21131,44947
+:- pred accu_substs_init1179,46958
+accu_substs_init1182,47098
+:- pred acc_var_subst_init1194,47574
+acc_var_subst_init1198,47719
+:- pred create_new_var1207,48148
+create_new_var1210,48289
+:- pred accu_process_assoc_set1223,48863
+accu_process_assoc_set1229,49151
+:- pred accu_has_heuristic1297,52082
+accu_has_heuristic1299,52162
+:- pred accu_heuristic1304,52337
+accu_heuristic1307,52458
+:- pred accu_process_update_set1318,52907
+accu_process_update_set1325,53222
+:- pred accu_divide_base_case1380,55845
+accu_divide_base_case1385,56060
+:- pred accu_related1412,57147
+accu_related1415,57271
+:- inst stored_goal_plain_call1444,58416
+:- pred lookup_call1449,58602
+lookup_call1452,58716
+:- pred accu_stage31470,59433
+accu_stage31477,59827
+:- pred acc_proc_info1508,61327
+acc_proc_info1512,61486
+:- pred acc_pred_info1556,63450
+acc_pred_info1559,63598
+:- pred accu_create_goal1600,65286
+accu_create_goal1607,65629
+:- func create_acc_call1621,66401
+create_acc_call1625,66570
+:- pred create_orig_goal1634,66988
+create_orig_goal1638,67177
+:- pred create_acc_goal1662,68158
+create_acc_goal1667,68381
+:- func create_new_orig_recursive_goals1709,70226
+create_new_orig_recursive_goals1712,70369
+:- func create_new_recursive_goals1723,70919
+create_new_recursive_goals1727,71109
+:- func create_new_base_goals1738,71718
+create_new_base_goals1741,71832
+:- pred acc_unification1749,72157
+acc_unification1751,72226
+:- pred accu_top_level1766,72897
+accu_top_level1770,73059
+:- pred update_accumulator_pred1856,76291
+update_accumulator_pred1859,76412
+:- func accu_rename1876,77254
+accu_rename1879,77364
+:- func base_case_ids1889,77785
+base_case_ids1891,77847
+:- func base_case_ids_set1898,78049
+base_case_ids_set1900,78114
+:- func accu_goal_list1905,78270
+accu_goal_list1907,78350
+:- pred calculate_goal_info1916,78681
+calculate_goal_info1918,78754
+:- func chain_subst1932,79320
+chain_subst1934,79379
+:- pred chain_subst_21938,79483
+chain_subst_21941,79577
+:- some [T] pred unravel_univ1956,80061
+:- pragma foreign_export1957,80117
+unravel_univ1961,80341
 
 c-src/c.c,76
 T f(1,0
diff --git a/test/manual/etags/ETAGS.good_6 b/test/manual/etags/ETAGS.good_6
index 6f440a7fc95..09abde35c51 100644
--- a/test/manual/etags/ETAGS.good_6
+++ b/test/manual/etags/ETAGS.good_6
@@ -4083,92 +4083,92 @@ complete(328,10055
 add_active(340,10527
 parse(353,10949
 derived_analyses(364,11341
-build(378,11965
-buildact(392,12521
-mapsyn(412,13542
-add_edge(434,14278
-findcats(447,14758
-normalize_tree(465,15478
-normalize_trees(475,15856
-expandmng_tree(486,16248
-expandmng_trees(496,16614
-cat(511,17013
-subtree(644,21266
-hypothetical_mem(653,21565
-make_coor(667,22130
-start_up:-start_up
688,23013
-tokenizeatom(710,23921
-tokenize(720,24348
-isoperator(752,25377
-isoptab(756,25431
-specialsymbol(765,25756
-sstab(771,25861
-parse_cgi(787,26347
-keyvalseq(792,26510
-andkeyvalseq(796,26609
-keyval(799,26688
-valseq(807,26920
-plusvalseq(810,27007
-val(816,27109
-argvals(824,27426
-commaargvals(828,27503
-atomval(833,27578
-atom(836,27640
-action(846,28004
-keyvalcgi(864,28649
-keyvalscgi(865,28670
-outsyn(868,28726
-act(876,29060
-actout(901,29906
-texttreelist(912,30089
-htmltreelist(918,30190
-fitchtreelist(924,30304
-pp_html_table_tree(938,30759
-pp_html_tree(949,31113
-pp_html_trees(988,32381
-pp_html_table_fitch_tree(999,32769
-pp_html_fitch_tree(1017,33672
-removeexp(1129,39002
-splitexp(1142,39490
-pp_exp(1155,39990
-map_word(1168,40249
-pp_exps(1180,40474
-pp_tree(1188,40777
-pp_trees(1216,41807
-pp_word_list(1225,42128
-pp_word(1231,42262
-pp_word_list_rest(1238,42569
-pp_cat(1248,42929
-pp_syn(1255,43196
-pp_syn_paren(1276,43899
-pp_paren(1293,44377
-pp_syn_back(1300,44661
-pp_bas_cat(1311,45001
-writecat(1322,45409
-writesubs(1351,46455
-writesups(1361,46757
-writelistsubs(1371,47090
-pp_lam(1380,47408
-pp_lam_bracket(1398,48022
-pp_lam_paren(1407,48338
-pp_rule(1429,49238
-member(1447,49866
-append_list(1451,49919
-append(1456,50010
-at_least_one_member(1460,50076
-numbervars(1464,50171
-reverse(1467,50209
-select(1471,50290
-select_last(1475,50357
-cat_atoms(1479,50436
-writelist(1485,50524
-write_lex_cat(1492,50676
-writebreaklex(1500,50988
-write_lex(1513,51265
-writebreak(1521,51541
-tt:-tt
1531,51713
-mt:-mt
1534,51784
-cmt:-cmt
1537,51878
+build(378,11967
+buildact(392,12523
+mapsyn(412,13544
+add_edge(434,14280
+findcats(447,14760
+normalize_tree(465,15480
+normalize_trees(475,15858
+expandmng_tree(486,16250
+expandmng_trees(496,16616
+cat(511,17015
+subtree(644,21268
+hypothetical_mem(653,21567
+make_coor(667,22132
+start_up:-start_up
688,23015
+tokenizeatom(710,23923
+tokenize(720,24350
+isoperator(752,25379
+isoptab(756,25433
+specialsymbol(765,25758
+sstab(771,25863
+parse_cgi(787,26349
+keyvalseq(792,26512
+andkeyvalseq(796,26611
+keyval(799,26690
+valseq(807,26922
+plusvalseq(810,27009
+val(816,27111
+argvals(824,27428
+commaargvals(828,27505
+atomval(833,27580
+atom(836,27642
+action(846,28006
+keyvalcgi(864,28651
+keyvalscgi(865,28672
+outsyn(868,28728
+act(876,29062
+actout(901,29908
+texttreelist(912,30091
+htmltreelist(918,30192
+fitchtreelist(924,30306
+pp_html_table_tree(938,30761
+pp_html_tree(949,31115
+pp_html_trees(988,32383
+pp_html_table_fitch_tree(999,32771
+pp_html_fitch_tree(1017,33674
+removeexp(1129,39004
+splitexp(1142,39492
+pp_exp(1155,39992
+map_word(1168,40251
+pp_exps(1180,40476
+pp_tree(1188,40779
+pp_trees(1216,41809
+pp_word_list(1225,42130
+pp_word(1231,42264
+pp_word_list_rest(1238,42571
+pp_cat(1248,42931
+pp_syn(1255,43198
+pp_syn_paren(1276,43901
+pp_paren(1293,44379
+pp_syn_back(1300,44663
+pp_bas_cat(1311,45003
+writecat(1322,45411
+writesubs(1351,46457
+writesups(1361,46759
+writelistsubs(1371,47092
+pp_lam(1380,47410
+pp_lam_bracket(1398,48024
+pp_lam_paren(1407,48340
+pp_rule(1429,49240
+member(1447,49868
+append_list(1451,49921
+append(1456,50012
+at_least_one_member(1460,50078
+numbervars(1464,50173
+reverse(1467,50211
+select(1471,50292
+select_last(1475,50359
+cat_atoms(1479,50438
+writelist(1485,50526
+write_lex_cat(1492,50678
+writebreaklex(1500,50990
+write_lex(1513,51267
+writebreak(1521,51543
+tt:-tt
1531,51715
+mt:-mt
1534,51786
+cmt:-cmt
1537,51880
 
 pyt-src/server.py,1438
 class Controls:Controls
17,358
@@ -5074,108 +5074,108 @@ initialize_goal_store573,22166
 accu_store584,22576
 :- pred identify_recursive_calls601,23288
 identify_recursive_calls604,23406
-:- pred identify_out_and_out_prime626,24396
-identify_out_and_out_prime631,24631
-:- type accu_sets676,26425
-:- pred accu_stage1689,26977
-accu_stage1693,27155
-:- pred accu_stage1_2727,28347
-accu_stage1_2731,28515
-:- pred accu_sets_init781,30557
-accu_sets_init783,30605
-:- func set_upto796,30984
-set_upto798,31039
-:- pred accu_before812,31498
-accu_before815,31639
-:- pred accu_assoc835,32477
-accu_assoc838,32617
-:- pred accu_construct862,33712
-accu_construct865,33856
-:- pred accu_construct_assoc896,35307
-accu_construct_assoc899,35457
-:- pred accu_update938,37069
-accu_update941,37210
-:- pred member_lessthan_goalid964,38219
-member_lessthan_goalid967,38342
-:- type accu_assoc975,38652
-:- pred accu_is_associative986,39138
-accu_is_associative989,39250
-:- pred associativity_assertion1014,40263
-associativity_assertion1017,40404
-:- pred commutativity_assertion1037,41242
-commutativity_assertion1040,41369
-:- pred accu_is_update1057,41952
-accu_is_update1060,42066
-:- pred is_associative_construction1078,42802
-is_associative_construction1081,42898
-:- type accu_substs1095,43480
-:- type accu_base1103,43744
-:- pred accu_stage21124,44605
-accu_stage21131,44946
-:- pred accu_substs_init1179,46957
-accu_substs_init1182,47097
-:- pred acc_var_subst_init1194,47573
-acc_var_subst_init1198,47718
-:- pred create_new_var1207,48147
-create_new_var1210,48288
-:- pred accu_process_assoc_set1223,48862
-accu_process_assoc_set1229,49150
-:- pred accu_has_heuristic1297,52081
-accu_has_heuristic1299,52161
-:- pred accu_heuristic1304,52336
-accu_heuristic1307,52457
-:- pred accu_process_update_set1318,52906
-accu_process_update_set1325,53221
-:- pred accu_divide_base_case1380,55844
-accu_divide_base_case1385,56059
-:- pred accu_related1412,57146
-accu_related1415,57270
-:- inst stored_goal_plain_call1444,58415
-:- pred lookup_call1449,58601
-lookup_call1452,58715
-:- pred accu_stage31470,59432
-accu_stage31477,59826
-:- pred acc_proc_info1508,61326
-acc_proc_info1512,61485
-:- pred acc_pred_info1556,63449
-acc_pred_info1559,63597
-:- pred accu_create_goal1600,65285
-accu_create_goal1607,65628
-:- func create_acc_call1621,66400
-create_acc_call1625,66569
-:- pred create_orig_goal1634,66987
-create_orig_goal1638,67176
-:- pred create_acc_goal1662,68157
-create_acc_goal1667,68380
-:- func create_new_orig_recursive_goals1709,70225
-create_new_orig_recursive_goals1712,70368
-:- func create_new_recursive_goals1723,70918
-create_new_recursive_goals1727,71108
-:- func create_new_base_goals1738,71717
-create_new_base_goals1741,71831
-:- pred acc_unification1749,72156
-acc_unification1751,72225
-:- pred accu_top_level1766,72896
-accu_top_level1770,73058
-:- pred update_accumulator_pred1856,76290
-update_accumulator_pred1859,76411
-:- func accu_rename1876,77253
-accu_rename1879,77363
-:- func base_case_ids1889,77784
-base_case_ids1891,77846
-:- func base_case_ids_set1898,78048
-base_case_ids_set1900,78113
-:- func accu_goal_list1905,78269
-accu_goal_list1907,78349
-:- pred calculate_goal_info1916,78680
-calculate_goal_info1918,78753
-:- func chain_subst1932,79319
-chain_subst1934,79378
-:- pred chain_subst_21938,79482
-chain_subst_21941,79576
-:- some [T] pred unravel_univ1956,80060
-:- pragma foreign_export1957,80116
-unravel_univ1961,80340
+:- pred identify_out_and_out_prime626,24397
+identify_out_and_out_prime631,24632
+:- type accu_sets676,26426
+:- pred accu_stage1689,26978
+accu_stage1693,27156
+:- pred accu_stage1_2727,28348
+accu_stage1_2731,28516
+:- pred accu_sets_init781,30558
+accu_sets_init783,30606
+:- func set_upto796,30985
+set_upto798,31040
+:- pred accu_before812,31499
+accu_before815,31640
+:- pred accu_assoc835,32478
+accu_assoc838,32618
+:- pred accu_construct862,33713
+accu_construct865,33857
+:- pred accu_construct_assoc896,35308
+accu_construct_assoc899,35458
+:- pred accu_update938,37070
+accu_update941,37211
+:- pred member_lessthan_goalid964,38220
+member_lessthan_goalid967,38343
+:- type accu_assoc975,38653
+:- pred accu_is_associative986,39139
+accu_is_associative989,39251
+:- pred associativity_assertion1014,40264
+associativity_assertion1017,40405
+:- pred commutativity_assertion1037,41243
+commutativity_assertion1040,41370
+:- pred accu_is_update1057,41953
+accu_is_update1060,42067
+:- pred is_associative_construction1078,42803
+is_associative_construction1081,42899
+:- type accu_substs1095,43481
+:- type accu_base1103,43745
+:- pred accu_stage21124,44606
+accu_stage21131,44947
+:- pred accu_substs_init1179,46958
+accu_substs_init1182,47098
+:- pred acc_var_subst_init1194,47574
+acc_var_subst_init1198,47719
+:- pred create_new_var1207,48148
+create_new_var1210,48289
+:- pred accu_process_assoc_set1223,48863
+accu_process_assoc_set1229,49151
+:- pred accu_has_heuristic1297,52082
+accu_has_heuristic1299,52162
+:- pred accu_heuristic1304,52337
+accu_heuristic1307,52458
+:- pred accu_process_update_set1318,52907
+accu_process_update_set1325,53222
+:- pred accu_divide_base_case1380,55845
+accu_divide_base_case1385,56060
+:- pred accu_related1412,57147
+accu_related1415,57271
+:- inst stored_goal_plain_call1444,58416
+:- pred lookup_call1449,58602
+lookup_call1452,58716
+:- pred accu_stage31470,59433
+accu_stage31477,59827
+:- pred acc_proc_info1508,61327
+acc_proc_info1512,61486
+:- pred acc_pred_info1556,63450
+acc_pred_info1559,63598
+:- pred accu_create_goal1600,65286
+accu_create_goal1607,65629
+:- func create_acc_call1621,66401
+create_acc_call1625,66570
+:- pred create_orig_goal1634,66988
+create_orig_goal1638,67177
+:- pred create_acc_goal1662,68158
+create_acc_goal1667,68381
+:- func create_new_orig_recursive_goals1709,70226
+create_new_orig_recursive_goals1712,70369
+:- func create_new_recursive_goals1723,70919
+create_new_recursive_goals1727,71109
+:- func create_new_base_goals1738,71718
+create_new_base_goals1741,71832
+:- pred acc_unification1749,72157
+acc_unification1751,72226
+:- pred accu_top_level1766,72897
+accu_top_level1770,73059
+:- pred update_accumulator_pred1856,76291
+update_accumulator_pred1859,76412
+:- func accu_rename1876,77254
+accu_rename1879,77364
+:- func base_case_ids1889,77785
+base_case_ids1891,77847
+:- func base_case_ids_set1898,78049
+base_case_ids_set1900,78114
+:- func accu_goal_list1905,78270
+accu_goal_list1907,78350
+:- pred calculate_goal_info1916,78681
+calculate_goal_info1918,78754
+:- func chain_subst1932,79320
+chain_subst1934,79379
+:- pred chain_subst_21938,79483
+chain_subst_21941,79577
+:- some [T] pred unravel_univ1956,80061
+:- pragma foreign_export1957,80117
+unravel_univ1961,80341
 
 c-src/c.c,76
 T f(1,0