diff --git a/src/common/keywords.s b/src/common/keywords.s
index 1cb88f7220..ee628f3ea0 100644
--- a/src/common/keywords.s
+++ b/src/common/keywords.s
@@ -47,7 +47,7 @@ Ltmp3:
 	##DEBUG_VALUE: ScanKeywords_hash_func:keylen <- $rsi
 	##DEBUG_VALUE: ScanKeywords_hash_func:key <- $rdi
 	.loc	5 0 15                  ## ./kwlist_d.h:0:15
-	movl	$381, %esi              ## imm = 0x17D
+	movl	$51, %esi
 Ltmp4:
                                         ## implicit-def: $eax
                                         ## implicit-def: $ecx
@@ -94,17 +94,17 @@ Ltmp8:
 	##DEBUG_VALUE: c <- $r10d
 	.loc	5 1058 9 is_stmt 1      ## ./kwlist_d.h:1058:9
 	movl	%eax, %edx
-	shll	$5, %edx
-	subl	%eax, %edx
-	.loc	5 1058 14 is_stmt 0     ## ./kwlist_d.h:1058:14
+	shll	$8, %edx
+	addl	%eax, %edx
+	.loc	5 1058 15 is_stmt 0     ## ./kwlist_d.h:1058:15
 	addl	%r10d, %edx
 Ltmp9:
 	##DEBUG_VALUE: ScanKeywords_hash_func:a <- $edx
 	.loc	5 1059 9 is_stmt 1      ## ./kwlist_d.h:1059:9
 	movl	%ecx, %esi
-	shll	$7, %esi
-	subl	%ecx, %esi
-	.loc	5 1059 15 is_stmt 0     ## ./kwlist_d.h:1059:15
+	shll	$4, %esi
+	addl	%ecx, %esi
+	.loc	5 1059 14 is_stmt 0     ## ./kwlist_d.h:1059:14
 	addl	%r10d, %esi
 	.loc	5 1056 21 is_stmt 1     ## ./kwlist_d.h:1056:21
 	movzbl	1(%rdi), %r10d
@@ -121,17 +121,17 @@ Ltmp12:
 	##DEBUG_VALUE: c <- $r10d
 	.loc	5 1058 9 is_stmt 1      ## ./kwlist_d.h:1058:9
 	movl	%edx, %eax
-	shll	$5, %eax
-	subl	%edx, %eax
-	.loc	5 1058 14 is_stmt 0     ## ./kwlist_d.h:1058:14
+	shll	$8, %eax
+	addl	%edx, %eax
+	.loc	5 1058 15 is_stmt 0     ## ./kwlist_d.h:1058:15
 	addl	%r10d, %eax
 Ltmp13:
 	##DEBUG_VALUE: ScanKeywords_hash_func:a <- $eax
 	.loc	5 1059 9 is_stmt 1      ## ./kwlist_d.h:1059:9
 	movl	%esi, %ecx
-	shll	$7, %ecx
-	subl	%esi, %ecx
-	.loc	5 1059 15 is_stmt 0     ## ./kwlist_d.h:1059:15
+	shll	$4, %ecx
+	addl	%esi, %ecx
+	.loc	5 1059 14 is_stmt 0     ## ./kwlist_d.h:1059:14
 	addl	%r10d, %ecx
 Ltmp14:
 	##DEBUG_VALUE: ScanKeywords_hash_func:keylen <- [DW_OP_constu 2, DW_OP_minus, DW_OP_stack_value] undef
@@ -145,11 +145,11 @@ Ltmp15:
 	##DEBUG_VALUE: ScanKeywords_hash_func:a <- $eax
 	##DEBUG_VALUE: ScanKeywords_hash_func:k <- $rdi
 	movl	%eax, %edx
-	shll	$5, %edx
-	subl	%eax, %edx
+	shll	$8, %edx
+	addl	%eax, %edx
 	movl	%ecx, %esi
-	shll	$7, %esi
-	subl	%ecx, %esi
+	shll	$4, %esi
+	addl	%ecx, %esi
 	##DEBUG_VALUE: ScanKeywords_hash_func:k <- $rdi
 Ltmp16:
 	##DEBUG_VALUE: ScanKeywords_hash_func:k <- [DW_OP_plus_uconst 1, DW_OP_stack_value] $rdi
@@ -164,17 +164,17 @@ LBB0_8:
 	orl	$32, %eax
 Ltmp18:
 	##DEBUG_VALUE: c <- $eax
-	.loc	5 1059 15 is_stmt 1     ## ./kwlist_d.h:1059:15
+	.loc	5 1059 14 is_stmt 1     ## ./kwlist_d.h:1059:14
 	addl	%eax, %esi
 Ltmp19:
 	##DEBUG_VALUE: ScanKeywords_hash_func:b <- $esi
-	.loc	5 1058 14               ## ./kwlist_d.h:1058:14
+	.loc	5 1058 15               ## ./kwlist_d.h:1058:15
 	addl	%eax, %edx
 Ltmp20:
 	##DEBUG_VALUE: ScanKeywords_hash_func:a <- $edx
 	movl	%edx, %eax
 Ltmp21:
-	.loc	5 1059 15               ## ./kwlist_d.h:1059:15
+	.loc	5 1059 14               ## ./kwlist_d.h:1059:14
 	movl	%esi, %ecx
 Ltmp22:
 	##DEBUG_VALUE: ScanKeywords_hash_func:b <- $ecx
@@ -182,15 +182,16 @@ LBB0_9:
 	##DEBUG_VALUE: ScanKeywords_hash_func:k <- $rdi
 	.loc	5 1061 13               ## ./kwlist_d.h:1061:13
 	movl	%eax, %edx
-	movl	$2440647343, %esi       ## imm = 0x917952AF
-	imulq	%rsi, %rdx
-	shrq	$41, %rdx
-	imull	$901, %edx, %edx        ## imm = 0x385
+	shrl	%edx
+	imulq	$1218970763, %rdx, %rdx ## imm = 0x48A8048B
+	shrq	$39, %rdx
+	imull	$902, %edx, %edx        ## imm = 0x386
 	subl	%edx, %eax
 	movl	%ecx, %edx
-	imulq	%rsi, %rdx
-	shrq	$41, %rdx
-	imull	$901, %edx, %edx        ## imm = 0x385
+	shrl	%edx
+	imulq	$1218970763, %rdx, %rdx ## imm = 0x48A8048B
+	shrq	$39, %rdx
+	imull	$902, %edx, %edx        ## imm = 0x386
 	subl	%edx, %ecx
 Ltmp23:
 LBB0_10:
@@ -685,907 +686,908 @@ _ScanKeywordCategories:
 
 	.p2align	4               ## @ScanKeywords_hash_func.h
 _ScanKeywords_hash_func.h:
-	.short	65364                   ## 0xff54
+	.short	181                     ## 0xb5
 	.short	32767                   ## 0x7fff
+	.short	65447                   ## 0xffa7
+	.short	220                     ## 0xdc
+	.short	357                     ## 0x165
+	.short	0                       ## 0x0
+	.short	146                     ## 0x92
+	.short	0                       ## 0x0
+	.short	28                      ## 0x1c
+	.short	65351                   ## 0xff47
 	.short	32767                   ## 0x7fff
+	.short	284                     ## 0x11c
 	.short	32767                   ## 0x7fff
-	.short	0                       ## 0x0
-	.short	56                      ## 0x38
-	.short	362                     ## 0x16a
 	.short	32767                   ## 0x7fff
-	.short	0                       ## 0x0
-	.short	90                      ## 0x5a
-	.short	65285                   ## 0xff05
-	.short	332                     ## 0x14c
 	.short	32767                   ## 0x7fff
-	.short	66                      ## 0x42
-	.short	298                     ## 0x12a
-	.short	0                       ## 0x0
 	.short	32767                   ## 0x7fff
-	.short	88                      ## 0x58
-	.short	27                      ## 0x1b
-	.short	22                      ## 0x16
-	.short	65411                   ## 0xff83
-	.short	317                     ## 0x13d
+	.short	65067                   ## 0xfe2b
+	.short	65441                   ## 0xffa1
 	.short	0                       ## 0x0
+	.short	328                     ## 0x148
+	.short	32767                   ## 0x7fff
 	.short	32767                   ## 0x7fff
-	.short	65501                   ## 0xffdd
 	.short	0                       ## 0x0
+	.short	168                     ## 0xa8
+	.short	32767                   ## 0x7fff
+	.short	65390                   ## 0xff6e
+	.short	65346                   ## 0xff42
+	.short	26                      ## 0x1a
+	.short	32767                   ## 0x7fff
 	.short	32767                   ## 0x7fff
+	.short	0                       ## 0x0
+	.short	335                     ## 0x14f
+	.short	65424                   ## 0xff90
+	.short	237                     ## 0xed
+	.short	54                      ## 0x36
+	.short	170                     ## 0xaa
 	.short	32767                   ## 0x7fff
+	.short	0                       ## 0x0
 	.short	32767                   ## 0x7fff
-	.short	52                      ## 0x34
+	.short	0                       ## 0x0
+	.short	192                     ## 0xc0
 	.short	32767                   ## 0x7fff
-	.short	275                     ## 0x113
+	.short	180                     ## 0xb4
+	.short	401                     ## 0x191
+	.short	152                     ## 0x98
+	.short	169                     ## 0xa9
+	.short	269                     ## 0x10d
 	.short	32767                   ## 0x7fff
-	.short	65259                   ## 0xfeeb
+	.short	138                     ## 0x8a
 	.short	32767                   ## 0x7fff
 	.short	32767                   ## 0x7fff
-	.short	316                     ## 0x13c
-	.short	177                     ## 0xb1
+	.short	35                      ## 0x23
+	.short	217                     ## 0xd9
+	.short	288                     ## 0x120
 	.short	32767                   ## 0x7fff
+	.short	31                      ## 0x1f
 	.short	0                       ## 0x0
-	.short	398                     ## 0x18e
-	.short	58                      ## 0x3a
-	.short	272                     ## 0x110
-	.short	65448                   ## 0xffa8
+	.short	45                      ## 0x2d
 	.short	0                       ## 0x0
-	.short	65389                   ## 0xff6d
-	.short	242                     ## 0xf2
-	.short	143                     ## 0x8f
-	.short	401                     ## 0x191
+	.short	65415                   ## 0xff87
+	.short	33                      ## 0x21
 	.short	0                       ## 0x0
-	.short	32767                   ## 0x7fff
 	.short	0                       ## 0x0
-	.short	293                     ## 0x125
-	.short	355                     ## 0x163
+	.short	65111                   ## 0xfe57
 	.short	0                       ## 0x0
+	.short	247                     ## 0xf7
+	.short	406                     ## 0x196
+	.short	145                     ## 0x91
+	.short	32767                   ## 0x7fff
 	.short	0                       ## 0x0
-	.short	303                     ## 0x12f
+	.short	65463                   ## 0xffb7
+	.short	32767                   ## 0x7fff
+	.short	32767                   ## 0x7fff
+	.short	65                      ## 0x41
+	.short	867                     ## 0x363
+	.short	32767                   ## 0x7fff
+	.short	32767                   ## 0x7fff
+	.short	95                      ## 0x5f
+	.short	32767                   ## 0x7fff
+	.short	32767                   ## 0x7fff
+	.short	32767                   ## 0x7fff
+	.short	324                     ## 0x144
+	.short	223                     ## 0xdf
+	.short	198                     ## 0xc6
+	.short	33                      ## 0x21
+	.short	65278                   ## 0xfefe
 	.short	32767                   ## 0x7fff
-	.short	225                     ## 0xe1
-	.short	580                     ## 0x244
 	.short	0                       ## 0x0
-	.short	378                     ## 0x17a
+	.short	158                     ## 0x9e
+	.short	360                     ## 0x168
 	.short	0                       ## 0x0
+	.short	32                      ## 0x20
 	.short	0                       ## 0x0
 	.short	32767                   ## 0x7fff
-	.short	65511                   ## 0xffe7
-	.short	65224                   ## 0xfec8
+	.short	0                       ## 0x0
 	.short	32767                   ## 0x7fff
-	.short	65326                   ## 0xff2e
 	.short	0                       ## 0x0
+	.short	20                      ## 0x14
 	.short	32767                   ## 0x7fff
-	.short	65517                   ## 0xffed
 	.short	32767                   ## 0x7fff
-	.short	91                      ## 0x5b
-	.short	307                     ## 0x133
-	.short	354                     ## 0x162
+	.short	374                     ## 0x176
+	.short	65430                   ## 0xff96
 	.short	32767                   ## 0x7fff
+	.short	196                     ## 0xc4
 	.short	32767                   ## 0x7fff
-	.short	65518                   ## 0xffee
-	.short	36                      ## 0x24
+	.short	359                     ## 0x167
+	.short	64782                   ## 0xfd0e
 	.short	32767                   ## 0x7fff
 	.short	32767                   ## 0x7fff
-	.short	402                     ## 0x192
-	.short	292                     ## 0x124
-	.short	165                     ## 0xa5
-	.short	274                     ## 0x112
-	.short	0                       ## 0x0
 	.short	32767                   ## 0x7fff
-	.short	10                      ## 0xa
-	.short	65516                   ## 0xffec
+	.short	279                     ## 0x117
+	.short	32767                   ## 0x7fff
+	.short	65450                   ## 0xffaa
+	.short	65449                   ## 0xffa9
+	.short	240                     ## 0xf0
 	.short	32767                   ## 0x7fff
-	.short	294                     ## 0x126
+	.short	270                     ## 0x10e
+	.short	38                      ## 0x26
+	.short	498                     ## 0x1f2
+	.short	187                     ## 0xbb
+	.short	436                     ## 0x1b4
 	.short	32767                   ## 0x7fff
-	.short	64914                   ## 0xfd92
-	.short	326                     ## 0x146
 	.short	32767                   ## 0x7fff
-	.short	65408                   ## 0xff80
-	.short	0                       ## 0x0
-	.short	33                      ## 0x21
+	.short	26                      ## 0x1a
+	.short	324                     ## 0x144
 	.short	32767                   ## 0x7fff
+	.short	422                     ## 0x1a6
 	.short	32767                   ## 0x7fff
-	.short	325                     ## 0x145
 	.short	32767                   ## 0x7fff
-	.short	276                     ## 0x114
-	.short	343                     ## 0x157
+	.short	513                     ## 0x201
+	.short	135                     ## 0x87
+	.short	64998                   ## 0xfde6
+	.short	368                     ## 0x170
+	.short	121                     ## 0x79
+	.short	10                      ## 0xa
+	.short	32767                   ## 0x7fff
+	.short	47                      ## 0x2f
+	.short	378                     ## 0x17a
+	.short	395                     ## 0x18b
+	.short	0                       ## 0x0
+	.short	65506                   ## 0xffe2
+	.short	139                     ## 0x8b
+	.short	162                     ## 0xa2
+	.short	32767                   ## 0x7fff
+	.short	6                       ## 0x6
+	.short	55                      ## 0x37
+	.short	447                     ## 0x1bf
 	.short	32767                   ## 0x7fff
-	.short	96                      ## 0x60
-	.short	173                     ## 0xad
 	.short	32767                   ## 0x7fff
+	.short	616                     ## 0x268
+	.short	41                      ## 0x29
 	.short	32767                   ## 0x7fff
 	.short	32767                   ## 0x7fff
 	.short	0                       ## 0x0
 	.short	32767                   ## 0x7fff
-	.short	320                     ## 0x140
-	.short	65408                   ## 0xff80
 	.short	32767                   ## 0x7fff
-	.short	357                     ## 0x165
-	.short	24                      ## 0x18
-	.short	65527                   ## 0xfff7
-	.short	427                     ## 0x1ab
 	.short	32767                   ## 0x7fff
+	.short	386                     ## 0x182
+	.short	154                     ## 0x9a
 	.short	32767                   ## 0x7fff
-	.short	0                       ## 0x0
+	.short	65389                   ## 0xff6d
 	.short	32767                   ## 0x7fff
+	.short	175                     ## 0xaf
+	.short	360                     ## 0x168
 	.short	0                       ## 0x0
-	.short	0                       ## 0x0
+	.short	65272                   ## 0xfef8
+	.short	154                     ## 0x9a
 	.short	32767                   ## 0x7fff
 	.short	32767                   ## 0x7fff
-	.short	405                     ## 0x195
 	.short	32767                   ## 0x7fff
-	.short	125                     ## 0x7d
+	.short	421                     ## 0x1a5
+	.short	32767                   ## 0x7fff
 	.short	32767                   ## 0x7fff
+	.short	65467                   ## 0xffbb
 	.short	0                       ## 0x0
 	.short	32767                   ## 0x7fff
-	.short	65496                   ## 0xffd8
+	.short	65341                   ## 0xff3d
+	.short	394                     ## 0x18a
+	.short	356                     ## 0x164
+	.short	32767                   ## 0x7fff
+	.short	64746                   ## 0xfcea
+	.short	306                     ## 0x132
 	.short	32767                   ## 0x7fff
 	.short	0                       ## 0x0
-	.short	80                      ## 0x50
-	.short	0                       ## 0x0
 	.short	32767                   ## 0x7fff
+	.short	358                     ## 0x166
+	.short	65428                   ## 0xff94
 	.short	0                       ## 0x0
-	.short	95                      ## 0x5f
-	.short	65390                   ## 0xff6e
+	.short	566                     ## 0x236
+	.short	309                     ## 0x135
+	.short	340                     ## 0x154
+	.short	32767                   ## 0x7fff
+	.short	32767                   ## 0x7fff
+	.short	32767                   ## 0x7fff
 	.short	0                       ## 0x0
+	.short	874                     ## 0x36a
+	.short	64815                   ## 0xfd2f
+	.short	541                     ## 0x21d
 	.short	32767                   ## 0x7fff
-	.short	26                      ## 0x1a
-	.short	165                     ## 0xa5
 	.short	32767                   ## 0x7fff
-	.short	41                      ## 0x29
 	.short	32767                   ## 0x7fff
-	.short	418                     ## 0x1a2
+	.short	127                     ## 0x7f
+	.short	0                       ## 0x0
 	.short	32767                   ## 0x7fff
 	.short	32767                   ## 0x7fff
-	.short	40                      ## 0x28
+	.short	342                     ## 0x156
+	.short	65348                   ## 0xff44
+	.short	58                      ## 0x3a
+	.short	0                       ## 0x0
+	.short	271                     ## 0x10f
+	.short	93                      ## 0x5d
+	.short	0                       ## 0x0
+	.short	148                     ## 0x94
+	.short	249                     ## 0xf9
 	.short	32767                   ## 0x7fff
-	.short	147                     ## 0x93
+	.short	212                     ## 0xd4
+	.short	0                       ## 0x0
+	.short	268                     ## 0x10c
+	.short	291                     ## 0x123
 	.short	32767                   ## 0x7fff
+	.short	65504                   ## 0xffe0
 	.short	32767                   ## 0x7fff
+	.short	407                     ## 0x197
 	.short	32767                   ## 0x7fff
-	.short	91                      ## 0x5b
-	.short	110                     ## 0x6e
-	.short	9                       ## 0x9
-	.short	305                     ## 0x131
-	.short	65196                   ## 0xfeac
 	.short	32767                   ## 0x7fff
-	.short	103                     ## 0x67
+	.short	65206                   ## 0xfeb6
+	.short	65134                   ## 0xfe6e
+	.short	65457                   ## 0xffb1
+	.short	0                       ## 0x0
 	.short	32767                   ## 0x7fff
 	.short	0                       ## 0x0
-	.short	329                     ## 0x149
+	.short	308                     ## 0x134
+	.short	0                       ## 0x0
+	.short	0                       ## 0x0
+	.short	65430                   ## 0xff96
 	.short	32767                   ## 0x7fff
 	.short	32767                   ## 0x7fff
-	.short	310                     ## 0x136
 	.short	32767                   ## 0x7fff
+	.short	0                       ## 0x0
 	.short	32767                   ## 0x7fff
-	.short	147                     ## 0x93
-	.short	65274                   ## 0xfefa
-	.short	422                     ## 0x1a6
-	.short	393                     ## 0x189
-	.short	382                     ## 0x17e
-	.short	136                     ## 0x88
 	.short	32767                   ## 0x7fff
-	.short	177                     ## 0xb1
-	.short	0                       ## 0x0
 	.short	32767                   ## 0x7fff
+	.short	57                      ## 0x39
 	.short	32767                   ## 0x7fff
-	.short	102                     ## 0x66
 	.short	0                       ## 0x0
 	.short	32767                   ## 0x7fff
-	.short	83                      ## 0x53
-	.short	141                     ## 0x8d
-	.short	28                      ## 0x1c
-	.short	167                     ## 0xa7
-	.short	65115                   ## 0xfe5b
 	.short	32767                   ## 0x7fff
-	.short	38                      ## 0x26
-	.short	111                     ## 0x6f
+	.short	123                     ## 0x7b
+	.short	64874                   ## 0xfd6a
+	.short	32767                   ## 0x7fff
+	.short	377                     ## 0x179
+	.short	81                      ## 0x51
 	.short	0                       ## 0x0
-	.short	479                     ## 0x1df
+	.short	144                     ## 0x90
 	.short	32767                   ## 0x7fff
+	.short	77                      ## 0x4d
+	.short	65324                   ## 0xff2c
+	.short	79                      ## 0x4f
+	.short	383                     ## 0x17f
+	.short	0                       ## 0x0
+	.short	65367                   ## 0xff57
+	.short	508                     ## 0x1fc
+	.short	250                     ## 0xfa
 	.short	32767                   ## 0x7fff
-	.short	29                      ## 0x1d
-	.short	439                     ## 0x1b7
 	.short	32767                   ## 0x7fff
-	.short	427                     ## 0x1ab
-	.short	65530                   ## 0xfffa
-	.short	182                     ## 0xb6
+	.short	45                      ## 0x2d
+	.short	0                       ## 0x0
 	.short	32767                   ## 0x7fff
-	.short	74                      ## 0x4a
+	.short	65338                   ## 0xff3a
 	.short	32767                   ## 0x7fff
-	.short	360                     ## 0x168
-	.short	236                     ## 0xec
 	.short	32767                   ## 0x7fff
+	.short	271                     ## 0x10f
 	.short	32767                   ## 0x7fff
-	.short	327                     ## 0x147
-	.short	65473                   ## 0xffc1
-	.short	162                     ## 0xa2
-	.short	154                     ## 0x9a
-	.short	184                     ## 0xb8
-	.short	90                      ## 0x5a
-	.short	263                     ## 0x107
-	.short	115                     ## 0x73
-	.short	127                     ## 0x7f
-	.short	539                     ## 0x21b
-	.short	347                     ## 0x15b
-	.short	65464                   ## 0xffb8
+	.short	134                     ## 0x86
+	.short	291                     ## 0x123
+	.short	276                     ## 0x114
+	.short	64881                   ## 0xfd71
+	.short	0                       ## 0x0
+	.short	146                     ## 0x92
 	.short	32767                   ## 0x7fff
-	.short	65377                   ## 0xff61
 	.short	32767                   ## 0x7fff
-	.short	65287                   ## 0xff07
-	.short	152                     ## 0x98
+	.short	116                     ## 0x74
 	.short	32767                   ## 0x7fff
-	.short	357                     ## 0x165
-	.short	404                     ## 0x194
-	.short	65426                   ## 0xff92
 	.short	32767                   ## 0x7fff
-	.short	404                     ## 0x194
-	.short	345                     ## 0x159
 	.short	32767                   ## 0x7fff
-	.short	80                      ## 0x50
-	.short	352                     ## 0x160
-	.short	422                     ## 0x1a6
-	.short	61                      ## 0x3d
+	.short	375                     ## 0x177
 	.short	32767                   ## 0x7fff
 	.short	32767                   ## 0x7fff
+	.short	65256                   ## 0xfee8
 	.short	32767                   ## 0x7fff
-	.short	243                     ## 0xf3
-	.short	126                     ## 0x7e
-	.short	117                     ## 0x75
 	.short	32767                   ## 0x7fff
-	.short	0                       ## 0x0
 	.short	32767                   ## 0x7fff
+	.short	288                     ## 0x120
+	.short	348                     ## 0x15c
 	.short	32767                   ## 0x7fff
-	.short	208                     ## 0xd0
+	.short	163                     ## 0xa3
+	.short	65523                   ## 0xfff3
+	.short	794                     ## 0x31a
+	.short	440                     ## 0x1b8
+	.short	221                     ## 0xdd
 	.short	32767                   ## 0x7fff
+	.short	281                     ## 0x119
+	.short	51                      ## 0x33
 	.short	32767                   ## 0x7fff
-	.short	65516                   ## 0xffec
-	.short	430                     ## 0x1ae
-	.short	65341                   ## 0xff3d
+	.short	223                     ## 0xdf
+	.short	0                       ## 0x0
 	.short	32767                   ## 0x7fff
 	.short	32767                   ## 0x7fff
 	.short	32767                   ## 0x7fff
-	.short	118                     ## 0x76
-	.short	65474                   ## 0xffc2
+	.short	65248                   ## 0xfee0
+	.short	65378                   ## 0xff62
+	.short	65130                   ## 0xfe6a
+	.short	32767                   ## 0x7fff
+	.short	0                       ## 0x0
+	.short	310                     ## 0x136
+	.short	32767                   ## 0x7fff
 	.short	32767                   ## 0x7fff
 	.short	32767                   ## 0x7fff
-	.short	98                      ## 0x62
-	.short	136                     ## 0x88
 	.short	0                       ## 0x0
 	.short	0                       ## 0x0
 	.short	32767                   ## 0x7fff
-	.short	261                     ## 0x105
 	.short	32767                   ## 0x7fff
 	.short	0                       ## 0x0
+	.short	222                     ## 0xde
+	.short	321                     ## 0x141
+	.short	221                     ## 0xdd
 	.short	32767                   ## 0x7fff
-	.short	230                     ## 0xe6
-	.short	37                      ## 0x25
-	.short	750                     ## 0x2ee
-	.short	154                     ## 0x9a
+	.short	284                     ## 0x11c
+	.short	200                     ## 0xc8
 	.short	32767                   ## 0x7fff
-	.short	65450                   ## 0xffaa
-	.short	87                      ## 0x57
+	.short	65212                   ## 0xfebc
+	.short	234                     ## 0xea
+	.short	202                     ## 0xca
 	.short	32767                   ## 0x7fff
-	.short	6                       ## 0x6
-	.short	61                      ## 0x3d
+	.short	343                     ## 0x157
 	.short	32767                   ## 0x7fff
-	.short	205                     ## 0xcd
+	.short	0                       ## 0x0
+	.short	65447                   ## 0xffa7
+	.short	32767                   ## 0x7fff
+	.short	10                      ## 0xa
 	.short	32767                   ## 0x7fff
-	.short	517                     ## 0x205
-	.short	107                     ## 0x6b
-	.short	66                      ## 0x42
-	.short	304                     ## 0x130
 	.short	32767                   ## 0x7fff
 	.short	0                       ## 0x0
 	.short	32767                   ## 0x7fff
+	.short	65510                   ## 0xffe6
+	.short	261                     ## 0x105
+	.short	65291                   ## 0xff0b
 	.short	32767                   ## 0x7fff
+	.short	296                     ## 0x128
 	.short	32767                   ## 0x7fff
-	.short	333                     ## 0x14d
 	.short	32767                   ## 0x7fff
-	.short	357                     ## 0x165
-	.short	239                     ## 0xef
 	.short	32767                   ## 0x7fff
 	.short	32767                   ## 0x7fff
-	.short	437                     ## 0x1b5
-	.short	65510                   ## 0xffe6
 	.short	32767                   ## 0x7fff
-	.short	210                     ## 0xd2
+	.short	42                      ## 0x2a
+	.short	49                      ## 0x31
+	.short	65023                   ## 0xfdff
+	.short	32767                   ## 0x7fff
 	.short	0                       ## 0x0
-	.short	20                      ## 0x14
-	.short	369                     ## 0x171
-	.short	10                      ## 0xa
+	.short	0                       ## 0x0
+	.short	129                     ## 0x81
+	.short	406                     ## 0x196
+	.short	13                      ## 0xd
+	.short	181                     ## 0xb5
+	.short	65497                   ## 0xffd9
+	.short	167                     ## 0xa7
+	.short	646                     ## 0x286
+	.short	256                     ## 0x100
 	.short	32767                   ## 0x7fff
-	.short	65458                   ## 0xffb2
-	.short	616                     ## 0x268
-	.short	70                      ## 0x46
 	.short	0                       ## 0x0
 	.short	32767                   ## 0x7fff
-	.short	86                      ## 0x56
 	.short	32767                   ## 0x7fff
+	.short	544                     ## 0x220
 	.short	0                       ## 0x0
+	.short	4                       ## 0x4
 	.short	32767                   ## 0x7fff
-	.short	14                      ## 0xe
-	.short	60                      ## 0x3c
-	.short	32                      ## 0x20
 	.short	32767                   ## 0x7fff
-	.short	373                     ## 0x175
-	.short	32767                   ## 0x7fff
-	.short	65318                   ## 0xff26
-	.short	320                     ## 0x140
+	.short	280                     ## 0x118
+	.short	65494                   ## 0xffd6
+	.short	65034                   ## 0xfe0a
+	.short	6                       ## 0x6
+	.short	347                     ## 0x15b
 	.short	32767                   ## 0x7fff
 	.short	268                     ## 0x10c
 	.short	32767                   ## 0x7fff
 	.short	32767                   ## 0x7fff
-	.short	425                     ## 0x1a9
-	.short	65469                   ## 0xffbd
+	.short	336                     ## 0x150
+	.short	64                      ## 0x40
+	.short	32767                   ## 0x7fff
+	.short	65515                   ## 0xffeb
+	.short	60                      ## 0x3c
 	.short	0                       ## 0x0
 	.short	32767                   ## 0x7fff
-	.short	252                     ## 0xfc
-	.short	32767                   ## 0x7fff
-	.short	65443                   ## 0xffa3
-	.short	193                     ## 0xc1
-	.short	65174                   ## 0xfe96
-	.short	65396                   ## 0xff74
-	.short	32767                   ## 0x7fff
-	.short	65208                   ## 0xfeb8
-	.short	32767                   ## 0x7fff
 	.short	0                       ## 0x0
-	.short	319                     ## 0x13f
-	.short	336                     ## 0x150
+	.short	65521                   ## 0xfff1
 	.short	32767                   ## 0x7fff
-	.short	121                     ## 0x79
+	.short	398                     ## 0x18e
+	.short	113                     ## 0x71
 	.short	0                       ## 0x0
-	.short	32767                   ## 0x7fff
-	.short	207                     ## 0xcf
-	.short	32767                   ## 0x7fff
-	.short	481                     ## 0x1e1
-	.short	65360                   ## 0xff50
-	.short	276                     ## 0x114
-	.short	47                      ## 0x2f
-	.short	235                     ## 0xeb
-	.short	32767                   ## 0x7fff
+	.short	145                     ## 0x91
 	.short	0                       ## 0x0
-	.short	221                     ## 0xdd
-	.short	32767                   ## 0x7fff
-	.short	228                     ## 0xe4
-	.short	32767                   ## 0x7fff
-	.short	84                      ## 0x54
-	.short	32767                   ## 0x7fff
 	.short	32767                   ## 0x7fff
+	.short	55                      ## 0x37
 	.short	32767                   ## 0x7fff
 	.short	32767                   ## 0x7fff
+	.short	65521                   ## 0xfff1
+	.short	0                       ## 0x0
+	.short	432                     ## 0x1b0
 	.short	32767                   ## 0x7fff
+	.short	370                     ## 0x172
 	.short	32767                   ## 0x7fff
-	.short	290                     ## 0x122
+	.short	0                       ## 0x0
+	.short	393                     ## 0x189
+	.short	74                      ## 0x4a
 	.short	32767                   ## 0x7fff
+	.short	312                     ## 0x138
 	.short	32767                   ## 0x7fff
-	.short	84                      ## 0x54
-	.short	65366                   ## 0xff56
-	.short	82                      ## 0x52
-	.short	246                     ## 0xf6
-	.short	65493                   ## 0xffd5
-	.short	201                     ## 0xc9
-	.short	155                     ## 0x9b
-	.short	65529                   ## 0xfff9
-	.short	299                     ## 0x12b
+	.short	184                     ## 0xb8
+	.short	65180                   ## 0xfe9c
+	.short	77                      ## 0x4d
+	.short	260                     ## 0x104
+	.short	154                     ## 0x9a
+	.short	0                       ## 0x0
 	.short	32767                   ## 0x7fff
+	.short	328                     ## 0x148
 	.short	32767                   ## 0x7fff
-	.short	241                     ## 0xf1
 	.short	32767                   ## 0x7fff
-	.short	65118                   ## 0xfe5e
+	.short	66                      ## 0x42
 	.short	32767                   ## 0x7fff
+	.short	302                     ## 0x12e
+	.short	65140                   ## 0xfe74
+	.short	65214                   ## 0xfebe
+	.short	65521                   ## 0xfff1
+	.short	79                      ## 0x4f
+	.short	101                     ## 0x65
+	.short	0                       ## 0x0
 	.short	32767                   ## 0x7fff
-	.short	65233                   ## 0xfed1
+	.short	65473                   ## 0xffc1
 	.short	32767                   ## 0x7fff
 	.short	32767                   ## 0x7fff
-	.short	65496                   ## 0xffd8
-	.short	308                     ## 0x134
 	.short	32767                   ## 0x7fff
 	.short	0                       ## 0x0
-	.short	178                     ## 0xb2
-	.short	65469                   ## 0xffbd
-	.short	32767                   ## 0x7fff
-	.short	273                     ## 0x111
-	.short	32767                   ## 0x7fff
+	.short	281                     ## 0x119
 	.short	0                       ## 0x0
+	.short	394                     ## 0x18a
+	.short	369                     ## 0x171
 	.short	32767                   ## 0x7fff
-	.short	69                      ## 0x45
-	.short	387                     ## 0x183
-	.short	32767                   ## 0x7fff
-	.short	341                     ## 0x155
+	.short	65401                   ## 0xff79
 	.short	0                       ## 0x0
 	.short	0                       ## 0x0
-	.short	65517                   ## 0xffed
-	.short	324                     ## 0x144
-	.short	65448                   ## 0xffa8
-	.short	166                     ## 0xa6
-	.short	32767                   ## 0x7fff
-	.short	6                       ## 0x6
-	.short	20                      ## 0x14
-	.short	32767                   ## 0x7fff
-	.short	17                      ## 0x11
-	.short	22                      ## 0x16
-	.short	359                     ## 0x167
 	.short	32767                   ## 0x7fff
 	.short	32767                   ## 0x7fff
-	.short	172                     ## 0xac
-	.short	0                       ## 0x0
 	.short	32767                   ## 0x7fff
 	.short	0                       ## 0x0
-	.short	206                     ## 0xce
-	.short	88                      ## 0x58
+	.short	65312                   ## 0xff20
+	.short	719                     ## 0x2cf
+	.short	246                     ## 0xf6
+	.short	3                       ## 0x3
 	.short	0                       ## 0x0
 	.short	32767                   ## 0x7fff
-	.short	35                      ## 0x23
-	.short	0                       ## 0x0
-	.short	275                     ## 0x113
-	.short	114                     ## 0x72
-	.short	339                     ## 0x153
+	.short	68                      ## 0x44
+	.short	243                     ## 0xf3
+	.short	64731                   ## 0xfcdb
+	.short	99                      ## 0x63
+	.short	65499                   ## 0xffdb
 	.short	32767                   ## 0x7fff
+	.short	30                      ## 0x1e
+	.short	681                     ## 0x2a9
 	.short	32767                   ## 0x7fff
 	.short	32767                   ## 0x7fff
 	.short	32767                   ## 0x7fff
+	.short	395                     ## 0x18b
 	.short	32767                   ## 0x7fff
-	.short	524                     ## 0x20c
-	.short	0                       ## 0x0
-	.short	65484                   ## 0xffcc
-	.short	191                     ## 0xbf
-	.short	65421                   ## 0xff8d
-	.short	9                       ## 0x9
-	.short	200                     ## 0xc8
-	.short	102                     ## 0x66
-	.short	0                       ## 0x0
+	.short	210                     ## 0xd2
 	.short	32767                   ## 0x7fff
-	.short	3                       ## 0x3
-	.short	0                       ## 0x0
-	.short	0                       ## 0x0
-	.short	0                       ## 0x0
-	.short	65248                   ## 0xfee0
-	.short	0                       ## 0x0
-	.short	65404                   ## 0xff7c
 	.short	32767                   ## 0x7fff
-	.short	0                       ## 0x0
+	.short	809                     ## 0x329
 	.short	32767                   ## 0x7fff
-	.short	300                     ## 0x12c
-	.short	0                       ## 0x0
-	.short	0                       ## 0x0
-	.short	0                       ## 0x0
-	.short	212                     ## 0xd4
 	.short	32767                   ## 0x7fff
-	.short	260                     ## 0x104
+	.short	103                     ## 0x67
+	.short	65243                   ## 0xfedb
 	.short	32767                   ## 0x7fff
-	.short	65257                   ## 0xfee9
-	.short	104                     ## 0x68
-	.short	506                     ## 0x1fa
-	.short	0                       ## 0x0
-	.short	640                     ## 0x280
-	.short	38                      ## 0x26
-	.short	268                     ## 0x10c
+	.short	389                     ## 0x185
+	.short	47                      ## 0x2f
+	.short	322                     ## 0x142
+	.short	403                     ## 0x193
+	.short	344                     ## 0x158
+	.short	248                     ## 0xf8
+	.short	65317                   ## 0xff25
+	.short	8                       ## 0x8
 	.short	32767                   ## 0x7fff
-	.short	131                     ## 0x83
+	.short	104                     ## 0x68
 	.short	32767                   ## 0x7fff
+	.short	305                     ## 0x131
+	.short	275                     ## 0x113
 	.short	32767                   ## 0x7fff
 	.short	32767                   ## 0x7fff
+	.short	176                     ## 0xb0
+	.short	202                     ## 0xca
+	.short	732                     ## 0x2dc
 	.short	32767                   ## 0x7fff
-	.short	0                       ## 0x0
-	.short	0                       ## 0x0
 	.short	32767                   ## 0x7fff
 	.short	32767                   ## 0x7fff
-	.short	18                      ## 0x12
-	.short	100                     ## 0x64
-	.short	44                      ## 0x2c
-	.short	67                      ## 0x43
-	.short	270                     ## 0x10e
-	.short	245                     ## 0xf5
-	.short	283                     ## 0x11b
-	.short	224                     ## 0xe0
-	.short	65470                   ## 0xffbe
 	.short	32767                   ## 0x7fff
 	.short	32767                   ## 0x7fff
+	.short	205                     ## 0xcd
 	.short	32767                   ## 0x7fff
-	.short	65469                   ## 0xffbd
 	.short	32767                   ## 0x7fff
-	.short	389                     ## 0x185
+	.short	79                      ## 0x4f
 	.short	32767                   ## 0x7fff
-	.short	0                       ## 0x0
-	.short	125                     ## 0x7d
-	.short	354                     ## 0x162
 	.short	32767                   ## 0x7fff
 	.short	32767                   ## 0x7fff
-	.short	65515                   ## 0xffeb
-	.short	124                     ## 0x7c
-	.short	0                       ## 0x0
-	.short	204                     ## 0xcc
+	.short	65478                   ## 0xffc6
+	.short	274                     ## 0x112
+	.short	65388                   ## 0xff6c
+	.short	268                     ## 0x10c
 	.short	32767                   ## 0x7fff
+	.short	3                       ## 0x3
 	.short	0                       ## 0x0
-	.short	99                      ## 0x63
 	.short	32767                   ## 0x7fff
-	.short	267                     ## 0x10b
-	.short	32767                   ## 0x7fff
-	.short	0                       ## 0x0
+	.short	286                     ## 0x11e
 	.short	32767                   ## 0x7fff
 	.short	32767                   ## 0x7fff
-	.short	231                     ## 0xe7
 	.short	32767                   ## 0x7fff
-	.short	65407                   ## 0xff7f
-	.short	65423                   ## 0xff8f
-	.short	108                     ## 0x6c
-	.short	23                      ## 0x17
-	.short	0                       ## 0x0
-	.short	0                       ## 0x0
+	.short	290                     ## 0x122
+	.short	319                     ## 0x13f
 	.short	32767                   ## 0x7fff
+	.short	219                     ## 0xdb
+	.short	230                     ## 0xe6
+	.short	65444                   ## 0xffa4
+	.short	150                     ## 0x96
+	.short	371                     ## 0x173
 	.short	32767                   ## 0x7fff
-	.short	0                       ## 0x0
+	.short	112                     ## 0x70
 	.short	32767                   ## 0x7fff
-	.short	269                     ## 0x10d
+	.short	1181                    ## 0x49d
 	.short	32767                   ## 0x7fff
+	.short	118                     ## 0x76
 	.short	32767                   ## 0x7fff
-	.short	65403                   ## 0xff7b
+	.short	57                      ## 0x39
+	.short	128                     ## 0x80
 	.short	32767                   ## 0x7fff
-	.short	65152                   ## 0xfe80
+	.short	15                      ## 0xf
+	.short	478                     ## 0x1de
+	.short	65473                   ## 0xffc1
+	.short	65382                   ## 0xff66
+	.short	325                     ## 0x145
+	.short	402                     ## 0x192
+	.short	550                     ## 0x226
 	.short	32767                   ## 0x7fff
 	.short	32767                   ## 0x7fff
-	.short	0                       ## 0x0
 	.short	32767                   ## 0x7fff
 	.short	32767                   ## 0x7fff
 	.short	32767                   ## 0x7fff
+	.short	65204                   ## 0xfeb4
+	.short	0                       ## 0x0
+	.short	64931                   ## 0xfda3
 	.short	0                       ## 0x0
 	.short	32767                   ## 0x7fff
+	.short	208                     ## 0xd0
 	.short	32767                   ## 0x7fff
+	.short	84                      ## 0x54
+	.short	46                      ## 0x2e
 	.short	32767                   ## 0x7fff
 	.short	0                       ## 0x0
-	.short	322                     ## 0x142
-	.short	424                     ## 0x1a8
-	.short	117                     ## 0x75
-	.short	65507                   ## 0xffe3
+	.short	670                     ## 0x29e
+	.short	96                      ## 0x60
 	.short	32767                   ## 0x7fff
+	.short	118                     ## 0x76
+	.short	445                     ## 0x1bd
+	.short	0                       ## 0x0
 	.short	32767                   ## 0x7fff
-	.short	145                     ## 0x91
 	.short	0                       ## 0x0
+	.short	150                     ## 0x96
 	.short	0                       ## 0x0
-	.short	323                     ## 0x143
-	.short	119                     ## 0x77
 	.short	32767                   ## 0x7fff
 	.short	32767                   ## 0x7fff
 	.short	32767                   ## 0x7fff
-	.short	392                     ## 0x188
-	.short	65372                   ## 0xff5c
-	.short	65393                   ## 0xff71
-	.short	65511                   ## 0xffe7
-	.short	65430                   ## 0xff96
 	.short	0                       ## 0x0
-	.short	97                      ## 0x61
+	.short	65482                   ## 0xffca
 	.short	32767                   ## 0x7fff
+	.short	0                       ## 0x0
 	.short	32767                   ## 0x7fff
-	.short	235                     ## 0xeb
+	.short	535                     ## 0x217
 	.short	32767                   ## 0x7fff
-	.short	0                       ## 0x0
+	.short	309                     ## 0x135
 	.short	32767                   ## 0x7fff
-	.short	411                     ## 0x19b
-	.short	363                     ## 0x16b
 	.short	32767                   ## 0x7fff
-	.short	31                      ## 0x1f
+	.short	65254                   ## 0xfee6
 	.short	32767                   ## 0x7fff
-	.short	443                     ## 0x1bb
+	.short	0                       ## 0x0
 	.short	32767                   ## 0x7fff
-	.short	76                      ## 0x4c
-	.short	29                      ## 0x1d
+	.short	24                      ## 0x18
+	.short	40                      ## 0x28
 	.short	32767                   ## 0x7fff
-	.short	323                     ## 0x143
 	.short	32767                   ## 0x7fff
-	.short	142                     ## 0x8e
+	.short	109                     ## 0x6d
+	.short	588                     ## 0x24c
+	.short	78                      ## 0x4e
 	.short	32767                   ## 0x7fff
-	.short	0                       ## 0x0
-	.short	244                     ## 0xf4
-	.short	0                       ## 0x0
+	.short	25                      ## 0x19
 	.short	32767                   ## 0x7fff
-	.short	28                      ## 0x1c
+	.short	152                     ## 0x98
+	.short	65103                   ## 0xfe4f
+	.short	290                     ## 0x122
+	.short	65355                   ## 0xff4b
 	.short	32767                   ## 0x7fff
 	.short	0                       ## 0x0
-	.short	377                     ## 0x179
-	.short	65528                   ## 0xfff8
-	.short	65491                   ## 0xffd3
 	.short	32767                   ## 0x7fff
-	.short	37                      ## 0x25
-	.short	0                       ## 0x0
-	.short	350                     ## 0x15e
-	.short	0                       ## 0x0
+	.short	2                       ## 0x2
+	.short	187                     ## 0xbb
+	.short	349                     ## 0x15d
+	.short	21                      ## 0x15
 	.short	32767                   ## 0x7fff
 	.short	32767                   ## 0x7fff
-	.short	38                      ## 0x26
+	.short	353                     ## 0x161
+	.short	0                       ## 0x0
+	.short	411                     ## 0x19b
 	.short	416                     ## 0x1a0
+	.short	65415                   ## 0xff87
 	.short	32767                   ## 0x7fff
-	.short	265                     ## 0x109
-	.short	65458                   ## 0xffb2
-	.short	65228                   ## 0xfecc
-	.short	65485                   ## 0xffcd
-	.short	705                     ## 0x2c1
+	.short	329                     ## 0x149
+	.short	422                     ## 0x1a6
 	.short	32767                   ## 0x7fff
 	.short	32767                   ## 0x7fff
-	.short	0                       ## 0x0
-	.short	66                      ## 0x42
-	.short	0                       ## 0x0
+	.short	350                     ## 0x15e
 	.short	32767                   ## 0x7fff
 	.short	32767                   ## 0x7fff
+	.short	289                     ## 0x121
 	.short	32767                   ## 0x7fff
-	.short	81                      ## 0x51
-	.short	65286                   ## 0xff06
+	.short	354                     ## 0x162
+	.short	23                      ## 0x17
 	.short	32767                   ## 0x7fff
-	.short	1                       ## 0x1
-	.short	421                     ## 0x1a5
 	.short	32767                   ## 0x7fff
 	.short	32767                   ## 0x7fff
-	.short	0                       ## 0x0
+	.short	178                     ## 0xb2
 	.short	32767                   ## 0x7fff
-	.short	401                     ## 0x191
-	.short	198                     ## 0xc6
+	.short	65265                   ## 0xfef1
+	.short	65374                   ## 0xff5e
+	.short	141                     ## 0x8d
 	.short	32767                   ## 0x7fff
-	.short	256                     ## 0x100
-	.short	290                     ## 0x122
-	.short	210                     ## 0xd2
+	.short	0                       ## 0x0
+	.short	0                       ## 0x0
+	.short	32767                   ## 0x7fff
+	.short	351                     ## 0x15f
+	.short	313                     ## 0x139
+	.short	0                       ## 0x0
 	.short	32767                   ## 0x7fff
 	.short	32767                   ## 0x7fff
 	.short	32767                   ## 0x7fff
 	.short	32767                   ## 0x7fff
+	.short	8                       ## 0x8
+	.short	304                     ## 0x130
 	.short	0                       ## 0x0
-	.short	444                     ## 0x1bc
-	.short	211                     ## 0xd3
-	.short	65437                   ## 0xff9d
-	.short	220                     ## 0xdc
-	.short	64                      ## 0x40
+	.short	41                      ## 0x29
 	.short	32767                   ## 0x7fff
 	.short	32767                   ## 0x7fff
+	.short	65480                   ## 0xffc8
 	.short	32767                   ## 0x7fff
 	.short	32767                   ## 0x7fff
-	.short	190                     ## 0xbe
-	.short	19                      ## 0x13
-	.short	0                       ## 0x0
-	.short	216                     ## 0xd8
 	.short	32767                   ## 0x7fff
-	.short	262                     ## 0x106
 	.short	32767                   ## 0x7fff
-	.short	404                     ## 0x194
-	.short	562                     ## 0x232
-	.short	65314                   ## 0xff22
 	.short	0                       ## 0x0
+	.short	923                     ## 0x39b
+	.short	65252                   ## 0xfee4
+	.short	245                     ## 0xf5
+	.short	387                     ## 0x183
+	.short	212                     ## 0xd4
 	.short	0                       ## 0x0
-	.short	65374                   ## 0xff5e
 	.short	32767                   ## 0x7fff
-	.short	192                     ## 0xc0
-	.short	65                      ## 0x41
-	.short	32767                   ## 0x7fff
-	.short	150                     ## 0x96
-	.short	191                     ## 0xbf
 	.short	0                       ## 0x0
-	.short	218                     ## 0xda
-	.short	267                     ## 0x10b
-	.short	32767                   ## 0x7fff
-	.short	32767                   ## 0x7fff
-	.short	32767                   ## 0x7fff
-	.short	399                     ## 0x18f
-	.short	189                     ## 0xbd
-	.short	356                     ## 0x164
-	.short	532                     ## 0x214
+	.short	65489                   ## 0xffd1
 	.short	0                       ## 0x0
+	.short	520                     ## 0x208
+	.short	65532                   ## 0xfffc
+	.short	104                     ## 0x68
+	.short	522                     ## 0x20a
+	.short	32767                   ## 0x7fff
+	.short	65423                   ## 0xff8f
+	.short	88                      ## 0x58
+	.short	73                      ## 0x49
 	.short	32767                   ## 0x7fff
-	.short	429                     ## 0x1ad
 	.short	32767                   ## 0x7fff
 	.short	32767                   ## 0x7fff
-	.short	54                      ## 0x36
-	.short	279                     ## 0x117
-	.short	151                     ## 0x97
-	.short	0                       ## 0x0
-	.short	353                     ## 0x161
-	.short	394                     ## 0x18a
-	.short	176                     ## 0xb0
-	.short	215                     ## 0xd7
 	.short	32767                   ## 0x7fff
-	.short	15                      ## 0xf
-	.short	153                     ## 0x99
-	.short	137                     ## 0x89
-	.short	92                      ## 0x5c
-	.short	420                     ## 0x1a4
-	.short	47                      ## 0x2f
-	.short	253                     ## 0xfd
 	.short	0                       ## 0x0
-	.short	298                     ## 0x12a
-	.short	32767                   ## 0x7fff
 	.short	32767                   ## 0x7fff
 	.short	32767                   ## 0x7fff
-	.short	234                     ## 0xea
-	.short	164                     ## 0xa4
-	.short	241                     ## 0xf1
+	.short	189                     ## 0xbd
 	.short	32767                   ## 0x7fff
-	.short	0                       ## 0x0
-	.short	409                     ## 0x199
-	.short	0                       ## 0x0
+	.short	65241                   ## 0xfed9
+	.short	65516                   ## 0xffec
 	.short	32767                   ## 0x7fff
-	.short	0                       ## 0x0
 	.short	32767                   ## 0x7fff
-	.short	0                       ## 0x0
-	.short	70                      ## 0x46
 	.short	32767                   ## 0x7fff
+	.short	131                     ## 0x83
 	.short	32767                   ## 0x7fff
+	.short	273                     ## 0x111
+	.short	63                      ## 0x3f
+	.short	65399                   ## 0xff77
 	.short	32767                   ## 0x7fff
 	.short	0                       ## 0x0
 	.short	32767                   ## 0x7fff
+	.short	65512                   ## 0xffe8
+	.short	90                      ## 0x5a
 	.short	32767                   ## 0x7fff
 	.short	32767                   ## 0x7fff
-	.short	65398                   ## 0xff76
-	.short	32767                   ## 0x7fff
 	.short	32767                   ## 0x7fff
-	.short	65490                   ## 0xffd2
+	.short	0                       ## 0x0
 	.short	32767                   ## 0x7fff
-	.short	97                      ## 0x61
+	.short	65340                   ## 0xff3c
+	.short	365                     ## 0x16d
+	.short	313                     ## 0x139
+	.short	368                     ## 0x170
 	.short	32767                   ## 0x7fff
 	.short	0                       ## 0x0
-	.short	65410                   ## 0xff82
+	.short	31                      ## 0x1f
+	.short	332                     ## 0x14c
+	.short	412                     ## 0x19c
+	.short	670                     ## 0x29e
+	.short	391                     ## 0x187
 	.short	32767                   ## 0x7fff
-	.short	169                     ## 0xa9
-	.short	322                     ## 0x142
-	.short	392                     ## 0x188
 	.short	32767                   ## 0x7fff
-	.short	0                       ## 0x0
+	.short	368                     ## 0x170
 	.short	32767                   ## 0x7fff
+	.short	136                     ## 0x88
+	.short	0                       ## 0x0
+	.short	426                     ## 0x1aa
+	.short	116                     ## 0x74
 	.short	32767                   ## 0x7fff
 	.short	0                       ## 0x0
-	.short	282                     ## 0x11a
-	.short	296                     ## 0x128
+	.short	0                       ## 0x0
 	.short	32767                   ## 0x7fff
 	.short	0                       ## 0x0
-	.short	403                     ## 0x193
+	.short	5                       ## 0x5
+	.short	313                     ## 0x139
+	.short	109                     ## 0x6d
 	.short	32767                   ## 0x7fff
-	.short	65512                   ## 0xffe8
+	.short	259                     ## 0x103
 	.short	32767                   ## 0x7fff
+	.short	206                     ## 0xce
+	.short	177                     ## 0xb1
+	.short	449                     ## 0x1c1
+	.short	445                     ## 0x1bd
+	.short	65081                   ## 0xfe39
 	.short	65502                   ## 0xffde
+	.short	177                     ## 0xb1
 	.short	32767                   ## 0x7fff
+	.short	0                       ## 0x0
 	.short	32767                   ## 0x7fff
+	.short	0                       ## 0x0
+	.short	0                       ## 0x0
 	.short	32767                   ## 0x7fff
-	.short	418                     ## 0x1a2
+	.short	0                       ## 0x0
+	.short	0                       ## 0x0
+	.short	0                       ## 0x0
+	.short	64948                   ## 0xfdb4
 	.short	32767                   ## 0x7fff
 	.short	0                       ## 0x0
-	.short	97                      ## 0x61
-	.short	238                     ## 0xee
+	.short	30                      ## 0x1e
 	.short	32767                   ## 0x7fff
-	.short	144                     ## 0x90
-	.short	428                     ## 0x1ac
+	.short	65481                   ## 0xffc9
+	.short	332                     ## 0x14c
+	.short	32767                   ## 0x7fff
+	.short	0                       ## 0x0
+	.short	65462                   ## 0xffb6
 	.short	32767                   ## 0x7fff
-	.short	2                       ## 0x2
 	.short	32767                   ## 0x7fff
+	.short	65411                   ## 0xff83
 	.short	32767                   ## 0x7fff
+	.short	146                     ## 0x92
 	.short	32767                   ## 0x7fff
-	.short	194                     ## 0xc2
-	.short	65354                   ## 0xff4a
-	.short	12                      ## 0xc
 	.short	32767                   ## 0x7fff
-	.short	391                     ## 0x187
+	.short	252                     ## 0xfc
 	.short	32767                   ## 0x7fff
-	.short	880                     ## 0x370
 	.short	32767                   ## 0x7fff
+	.short	431                     ## 0x1af
+	.short	893                     ## 0x37d
+	.short	178                     ## 0xb2
+	.short	65524                   ## 0xfff4
 	.short	32767                   ## 0x7fff
-	.short	50                      ## 0x32
-	.short	331                     ## 0x14b
-	.short	0                       ## 0x0
-	.short	0                       ## 0x0
-	.short	358                     ## 0x166
-	.short	20                      ## 0x14
+	.short	142                     ## 0x8e
+	.short	299                     ## 0x12b
+	.short	207                     ## 0xcf
+	.short	25                      ## 0x19
+	.short	238                     ## 0xee
+	.short	65077                   ## 0xfe35
+	.short	148                     ## 0x94
 	.short	32767                   ## 0x7fff
+	.short	193                     ## 0xc1
 	.short	32767                   ## 0x7fff
-	.short	222                     ## 0xde
-	.short	317                     ## 0x13d
+	.short	11                      ## 0xb
+	.short	0                       ## 0x0
+	.short	0                       ## 0x0
 	.short	32767                   ## 0x7fff
 	.short	0                       ## 0x0
-	.short	125                     ## 0x7d
+	.short	0                       ## 0x0
+	.short	407                     ## 0x197
+	.short	383                     ## 0x17f
 	.short	32767                   ## 0x7fff
 	.short	0                       ## 0x0
+	.short	0                       ## 0x0
+	.short	330                     ## 0x14a
+	.short	0                       ## 0x0
 	.short	32767                   ## 0x7fff
-	.short	284                     ## 0x11c
+	.short	65492                   ## 0xffd4
 	.short	32767                   ## 0x7fff
+	.short	320                     ## 0x140
+	.short	32767                   ## 0x7fff
+	.short	277                     ## 0x115
 	.short	32767                   ## 0x7fff
-	.short	197                     ## 0xc5
-	.short	0                       ## 0x0
-	.short	63                      ## 0x3f
 	.short	32767                   ## 0x7fff
+	.short	174                     ## 0xae
+	.short	65325                   ## 0xff2d
 	.short	0                       ## 0x0
-	.short	188                     ## 0xbc
 	.short	32767                   ## 0x7fff
+	.short	0                       ## 0x0
+	.short	0                       ## 0x0
+	.short	65197                   ## 0xfead
+	.short	417                     ## 0x1a1
+	.short	0                       ## 0x0
 	.short	32767                   ## 0x7fff
-	.short	147                     ## 0x93
-	.short	190                     ## 0xbe
-	.short	344                     ## 0x158
 	.short	32767                   ## 0x7fff
-	.short	65494                   ## 0xffd6
+	.short	65407                   ## 0xff7f
+	.short	87                      ## 0x57
 	.short	32767                   ## 0x7fff
 	.short	0                       ## 0x0
-	.short	187                     ## 0xbb
+	.short	312                     ## 0x138
+	.short	42                      ## 0x2a
 	.short	32767                   ## 0x7fff
+	.short	65077                   ## 0xfe35
 	.short	32767                   ## 0x7fff
-	.short	350                     ## 0x15e
 	.short	32767                   ## 0x7fff
+	.short	297                     ## 0x129
+	.short	65451                   ## 0xffab
+	.short	82                      ## 0x52
+	.short	124                     ## 0x7c
+	.short	840                     ## 0x348
+	.short	236                     ## 0xec
+	.short	139                     ## 0x8b
 	.short	0                       ## 0x0
-	.short	0                       ## 0x0
-	.short	127                     ## 0x7f
 	.short	32767                   ## 0x7fff
+	.short	26                      ## 0x1a
 	.short	32767                   ## 0x7fff
-	.short	161                     ## 0xa1
+	.short	390                     ## 0x186
 	.short	32767                   ## 0x7fff
+	.short	143                     ## 0x8f
+	.short	93                      ## 0x5d
+	.short	115                     ## 0x73
+	.short	0                       ## 0x0
 	.short	0                       ## 0x0
 	.short	0                       ## 0x0
-	.short	382                     ## 0x17e
 	.short	32767                   ## 0x7fff
+	.short	65                      ## 0x41
+	.short	0                       ## 0x0
+	.short	84                      ## 0x54
+	.short	65402                   ## 0xff7a
 	.short	32767                   ## 0x7fff
-	.short	316                     ## 0x13c
-	.short	130                     ## 0x82
 	.short	32767                   ## 0x7fff
-	.short	379                     ## 0x17b
 	.short	32767                   ## 0x7fff
-	.short	383                     ## 0x17f
-	.short	368                     ## 0x170
-	.short	93                      ## 0x5d
-	.short	65341                   ## 0xff3d
-	.short	0                       ## 0x0
-	.short	233                     ## 0xe9
-	.short	73                      ## 0x49
 	.short	32767                   ## 0x7fff
-	.short	100                     ## 0x64
 	.short	32767                   ## 0x7fff
-	.short	338                     ## 0x152
-	.short	90                      ## 0x5a
 	.short	32767                   ## 0x7fff
-	.short	258                     ## 0x102
+	.short	103                     ## 0x67
+	.short	32767                   ## 0x7fff
+	.short	188                     ## 0xbc
+	.short	342                     ## 0x156
+	.short	72                      ## 0x48
+	.short	699                     ## 0x2bb
+	.short	102                     ## 0x66
+	.short	399                     ## 0x18f
+	.short	151                     ## 0x97
 	.short	32767                   ## 0x7fff
+	.short	626                     ## 0x272
+	.short	109                     ## 0x6d
+	.short	0                       ## 0x0
+	.short	65338                   ## 0xff3a
 	.short	32767                   ## 0x7fff
-	.short	235                     ## 0xeb
-	.short	175                     ## 0xaf
 	.short	32767                   ## 0x7fff
 	.short	32767                   ## 0x7fff
-	.short	0                       ## 0x0
-	.short	65527                   ## 0xfff7
-	.short	0                       ## 0x0
-	.short	0                       ## 0x0
+	.short	2                       ## 0x2
+	.short	19                      ## 0x13
 	.short	32767                   ## 0x7fff
 	.short	32767                   ## 0x7fff
-	.short	111                     ## 0x6f
-	.short	417                     ## 0x1a1
-	.short	330                     ## 0x14a
+	.short	195                     ## 0xc3
 	.short	0                       ## 0x0
+	.short	73                      ## 0x49
 	.short	0                       ## 0x0
-	.short	225                     ## 0xe1
 	.short	32767                   ## 0x7fff
-	.short	0                       ## 0x0
-	.short	0                       ## 0x0
 	.short	32767                   ## 0x7fff
 	.short	0                       ## 0x0
-	.short	64                      ## 0x40
+	.short	44                      ## 0x2c
 	.short	32767                   ## 0x7fff
 	.short	32767                   ## 0x7fff
-	.short	16                      ## 0x10
-	.short	113                     ## 0x71
-	.short	29                      ## 0x1d
-	.short	0                       ## 0x0
+	.short	64                      ## 0x40
+	.short	87                      ## 0x57
 	.short	32767                   ## 0x7fff
 	.short	32767                   ## 0x7fff
 	.short	0                       ## 0x0
-	.short	43                      ## 0x2b
-	.short	0                       ## 0x0
-	.short	365                     ## 0x16d
-	.short	65495                   ## 0xffd7
-	.short	65252                   ## 0xfee4
-	.short	0                       ## 0x0
-	.short	0                       ## 0x0
 	.short	0                       ## 0x0
-	.short	61                      ## 0x3d
-	.short	314                     ## 0x13a
-	.short	255                     ## 0xff
 	.short	0                       ## 0x0
 	.short	32767                   ## 0x7fff
-	.short	145                     ## 0x91
-	.short	32767                   ## 0x7fff
-	.short	65091                   ## 0xfe43
-	.short	32767                   ## 0x7fff
-	.short	32767                   ## 0x7fff
-	.short	154                     ## 0x9a
 
 	.section	__DWARF,__debug_str,regular,debug
 Linfo_string:
@@ -2317,7 +2319,7 @@ Ldebug_info_start0:
 	.long	567                     ## DW_AT_type
 	.byte	15                      ## Abbrev [15] 0x22f:0x7 DW_TAG_subrange_type
 	.long	327                     ## DW_AT_type
-	.short	901                     ## DW_AT_count
+	.short	902                     ## DW_AT_count
 	.byte	0                       ## End Of Children Mark
 	.byte	3                       ## Abbrev [3] 0x237:0x5 DW_TAG_const_type
 	.long	572                     ## DW_AT_type
diff --git a/src/interfaces/ecpg/preproc/c_keywords.s b/src/interfaces/ecpg/preproc/c_keywords.s
index 2bf3f117c6..3ade6bbf8d 100644
--- a/src/interfaces/ecpg/preproc/c_keywords.s
+++ b/src/interfaces/ecpg/preproc/c_keywords.s
@@ -44,19 +44,22 @@ Ltmp3:
 	cmpq	$8, %rax
 Ltmp4:
 	.loc	6 47 6 is_stmt 0        ## c_keywords.c:47:6
-	ja	LBB0_14
+	ja	LBB0_13
 Ltmp5:
 ## %bb.1:
 	##DEBUG_VALUE: ScanCKeywords_hash_func:keylen <- $rax
 	##DEBUG_VALUE: ScanCKeywordLookup:len <- $rax
 	##DEBUG_VALUE: ScanCKeywordLookup:str <- $r15
 	##DEBUG_VALUE: ScanCKeywords_hash_func:key <- $r15
-	##DEBUG_VALUE: ScanCKeywords_hash_func:a <- 1
-	##DEBUG_VALUE: ScanCKeywords_hash_func:b <- 2
+	.loc	6 0 6                   ## c_keywords.c:0:6
+	xorl	%esi, %esi
+Ltmp6:
+	##DEBUG_VALUE: ScanCKeywords_hash_func:b <- 0
+	##DEBUG_VALUE: ScanCKeywords_hash_func:a <- 0
 	.loc	5 100 2 is_stmt 1       ## ./c_kwlist_d.h:100:2
 	testq	%rax, %rax
 	je	LBB0_2
-Ltmp6:
+Ltmp7:
 ## %bb.3:
 	##DEBUG_VALUE: ScanCKeywords_hash_func:keylen <- $rax
 	##DEBUG_VALUE: ScanCKeywordLookup:len <- $rax
@@ -66,237 +69,229 @@ Ltmp6:
 	leaq	-1(%rax), %rcx
 	movl	%eax, %r8d
 	andl	$3, %r8d
-	cmpq	$3, %rcx
-	jae	LBB0_5
-Ltmp7:
-## %bb.4:
-	##DEBUG_VALUE: ScanCKeywords_hash_func:keylen <- $rax
-	##DEBUG_VALUE: ScanCKeywordLookup:len <- $rax
-	##DEBUG_VALUE: ScanCKeywordLookup:str <- $r15
-	##DEBUG_VALUE: ScanCKeywords_hash_func:key <- $r15
-	.loc	5 0 15                  ## ./c_kwlist_d.h:0:15
-	movl	$1, %esi
-	movl	$2, %edx
+	movl	$0, %ebx
 	movq	%r15, %r10
-	jmp	LBB0_7
+	cmpq	$3, %rcx
+	jb	LBB0_6
 Ltmp8:
-LBB0_2:
-	##DEBUG_VALUE: ScanCKeywords_hash_func:keylen <- $rax
-	##DEBUG_VALUE: ScanCKeywordLookup:len <- $rax
-	##DEBUG_VALUE: ScanCKeywordLookup:str <- $r15
-	##DEBUG_VALUE: ScanCKeywords_hash_func:key <- $r15
-	movl	$2, %ebx
-	movl	$1, %edi
-	jmp	LBB0_11
-Ltmp9:
-LBB0_5:
+## %bb.4:
 	##DEBUG_VALUE: ScanCKeywords_hash_func:keylen <- $rax
 	##DEBUG_VALUE: ScanCKeywordLookup:len <- $rax
 	##DEBUG_VALUE: ScanCKeywordLookup:str <- $r15
 	##DEBUG_VALUE: ScanCKeywords_hash_func:key <- $r15
-	.loc	5 100 15                ## ./c_kwlist_d.h:100:15
 	movq	%r8, %r9
 	subq	%rax, %r9
-	movl	$1, %esi
-	movl	$2, %edx
+	xorl	%esi, %esi
+	xorl	%ebx, %ebx
 	movq	%r15, %r10
-Ltmp10:
+Ltmp9:
 	.p2align	4, 0x90
-LBB0_6:                                 ## =>This Inner Loop Header: Depth=1
+LBB0_5:                                 ## =>This Inner Loop Header: Depth=1
 	##DEBUG_VALUE: ScanCKeywords_hash_func:keylen <- $rax
 	##DEBUG_VALUE: ScanCKeywordLookup:len <- $rax
 	##DEBUG_VALUE: ScanCKeywordLookup:str <- $r15
 	##DEBUG_VALUE: ScanCKeywords_hash_func:key <- $r15
 	##DEBUG_VALUE: ScanCKeywords_hash_func:keylen <- undef
-	##DEBUG_VALUE: ScanCKeywords_hash_func:a <- $esi
-	##DEBUG_VALUE: ScanCKeywords_hash_func:b <- $edx
+	##DEBUG_VALUE: ScanCKeywords_hash_func:a <- $ebx
+	##DEBUG_VALUE: ScanCKeywords_hash_func:b <- $esi
 	##DEBUG_VALUE: ScanCKeywords_hash_func:k <- $r10
 	##DEBUG_VALUE: c <- undef
 	.loc	5 102 21 is_stmt 1      ## ./c_kwlist_d.h:102:21
-	movzbl	(%r10), %ecx
+	movzbl	(%r10), %eax
+Ltmp10:
 	.loc	5 104 9                 ## ./c_kwlist_d.h:104:9
-	movl	%esi, %ebx
-	shll	$5, %ebx
-	subl	%esi, %ebx
-	.loc	5 104 14 is_stmt 0      ## ./c_kwlist_d.h:104:14
-	addl	%ecx, %ebx
+	movl	%ebx, %ecx
+	shll	$8, %ecx
+	addl	%ebx, %ecx
+	.loc	5 104 15 is_stmt 0      ## ./c_kwlist_d.h:104:15
+	addl	%eax, %ecx
 Ltmp11:
-	##DEBUG_VALUE: ScanCKeywords_hash_func:a <- $ebx
+	##DEBUG_VALUE: ScanCKeywords_hash_func:a <- $ecx
 	.loc	5 105 9 is_stmt 1       ## ./c_kwlist_d.h:105:9
-	movl	%edx, %esi
-	shll	$7, %esi
-	subl	%edx, %esi
-	.loc	5 105 15 is_stmt 0      ## ./c_kwlist_d.h:105:15
-	addl	%ecx, %esi
+	movl	%esi, %ebx
+	shll	$4, %ebx
+	addl	%esi, %ebx
+	.loc	5 105 14 is_stmt 0      ## ./c_kwlist_d.h:105:14
+	addl	%eax, %ebx
 Ltmp12:
 	##DEBUG_VALUE: ScanCKeywords_hash_func:keylen <- [DW_OP_constu 1, DW_OP_minus, DW_OP_stack_value] undef
-	##DEBUG_VALUE: ScanCKeywords_hash_func:b <- $esi
+	##DEBUG_VALUE: ScanCKeywords_hash_func:b <- $ebx
 	.loc	5 102 21 is_stmt 1      ## ./c_kwlist_d.h:102:21
-	movzbl	1(%r10), %ecx
+	movzbl	1(%r10), %eax
 	##DEBUG_VALUE: c <- undef
 	.loc	5 104 9                 ## ./c_kwlist_d.h:104:9
-	movl	%ebx, %edx
-	shll	$5, %edx
-	subl	%ebx, %edx
-	.loc	5 104 14 is_stmt 0      ## ./c_kwlist_d.h:104:14
-	addl	%ecx, %edx
+	movl	%ecx, %esi
+	shll	$8, %esi
+	addl	%ecx, %esi
+	.loc	5 104 15 is_stmt 0      ## ./c_kwlist_d.h:104:15
+	addl	%eax, %esi
 Ltmp13:
-	##DEBUG_VALUE: ScanCKeywords_hash_func:a <- $edx
+	##DEBUG_VALUE: ScanCKeywords_hash_func:a <- $esi
 	.loc	5 105 9 is_stmt 1       ## ./c_kwlist_d.h:105:9
-	movl	%esi, %ebx
-	shll	$7, %ebx
-	subl	%esi, %ebx
-	.loc	5 105 15 is_stmt 0      ## ./c_kwlist_d.h:105:15
-	addl	%ecx, %ebx
+	movl	%ebx, %ecx
+	shll	$4, %ecx
+	addl	%ebx, %ecx
+	.loc	5 105 14 is_stmt 0      ## ./c_kwlist_d.h:105:14
+	addl	%eax, %ecx
 Ltmp14:
 	##DEBUG_VALUE: ScanCKeywords_hash_func:keylen <- [DW_OP_constu 2, DW_OP_minus, DW_OP_stack_value] undef
-	##DEBUG_VALUE: ScanCKeywords_hash_func:b <- $ebx
+	##DEBUG_VALUE: ScanCKeywords_hash_func:b <- $ecx
 	.loc	5 102 21 is_stmt 1      ## ./c_kwlist_d.h:102:21
-	movzbl	2(%r10), %ecx
+	movzbl	2(%r10), %eax
 	##DEBUG_VALUE: c <- undef
 	.loc	5 104 9                 ## ./c_kwlist_d.h:104:9
-	movl	%edx, %edi
-	shll	$5, %edi
-	subl	%edx, %edi
-	.loc	5 104 14 is_stmt 0      ## ./c_kwlist_d.h:104:14
-	addl	%ecx, %edi
+	movl	%esi, %edi
+	shll	$8, %edi
+	addl	%esi, %edi
+	.loc	5 104 15 is_stmt 0      ## ./c_kwlist_d.h:104:15
+	addl	%eax, %edi
 Ltmp15:
 	##DEBUG_VALUE: ScanCKeywords_hash_func:a <- $edi
 	.loc	5 105 9 is_stmt 1       ## ./c_kwlist_d.h:105:9
-	movl	%ebx, %eax
-Ltmp16:
-	shll	$7, %eax
-	subl	%ebx, %eax
-	.loc	5 105 15 is_stmt 0      ## ./c_kwlist_d.h:105:15
-	addl	%ecx, %eax
+	movl	%ecx, %edx
+	shll	$4, %edx
+	addl	%ecx, %edx
+	.loc	5 105 14 is_stmt 0      ## ./c_kwlist_d.h:105:14
+	addl	%eax, %edx
 	.loc	5 102 21 is_stmt 1      ## ./c_kwlist_d.h:102:21
-	movzbl	3(%r10), %ecx
-Ltmp17:
+	movzbl	3(%r10), %eax
+Ltmp16:
 	##DEBUG_VALUE: ScanCKeywords_hash_func:keylen <- [DW_OP_constu 3, DW_OP_minus, DW_OP_stack_value] undef
-	##DEBUG_VALUE: ScanCKeywords_hash_func:b <- $eax
+	##DEBUG_VALUE: ScanCKeywords_hash_func:b <- $edx
 	.loc	5 102 23 is_stmt 0      ## ./c_kwlist_d.h:102:23
 	addq	$4, %r10
-Ltmp18:
+Ltmp17:
 	##DEBUG_VALUE: c <- undef
 	##DEBUG_VALUE: ScanCKeywords_hash_func:k <- $r10
 	.loc	5 104 9 is_stmt 1       ## ./c_kwlist_d.h:104:9
-	movl	%edi, %esi
-	shll	$5, %esi
-	subl	%edi, %esi
-	.loc	5 104 14 is_stmt 0      ## ./c_kwlist_d.h:104:14
-	addl	%ecx, %esi
-Ltmp19:
-	##DEBUG_VALUE: ScanCKeywords_hash_func:a <- $esi
+	movl	%edi, %ebx
+	shll	$8, %ebx
+	addl	%edi, %ebx
+	.loc	5 104 15 is_stmt 0      ## ./c_kwlist_d.h:104:15
+	addl	%eax, %ebx
+Ltmp18:
+	##DEBUG_VALUE: ScanCKeywords_hash_func:a <- $ebx
 	.loc	5 105 9 is_stmt 1       ## ./c_kwlist_d.h:105:9
-	movl	%eax, %edx
-	shll	$7, %edx
-	subl	%eax, %edx
-	.loc	5 105 15 is_stmt 0      ## ./c_kwlist_d.h:105:15
-	addl	%ecx, %edx
-Ltmp20:
+	movl	%edx, %esi
+	shll	$4, %esi
+	addl	%edx, %esi
+	.loc	5 105 14 is_stmt 0      ## ./c_kwlist_d.h:105:14
+	addl	%eax, %esi
+Ltmp19:
 	##DEBUG_VALUE: ScanCKeywords_hash_func:keylen <- [DW_OP_constu 4, DW_OP_minus, DW_OP_stack_value] undef
-	##DEBUG_VALUE: ScanCKeywords_hash_func:b <- $edx
+	##DEBUG_VALUE: ScanCKeywords_hash_func:b <- $esi
 	.loc	5 100 2 is_stmt 1       ## ./c_kwlist_d.h:100:2
 	addq	$4, %r9
-	jne	LBB0_6
-Ltmp21:
-LBB0_7:
+	jne	LBB0_5
+Ltmp20:
+LBB0_6:
 	##DEBUG_VALUE: ScanCKeywordLookup:str <- $r15
 	##DEBUG_VALUE: ScanCKeywords_hash_func:key <- $r15
-	.loc	5 104 14                ## ./c_kwlist_d.h:104:14
+	.loc	5 104 15                ## ./c_kwlist_d.h:104:15
+	movl	%ebx, %eax
+	.loc	5 105 14                ## ./c_kwlist_d.h:105:14
 	movl	%esi, %edi
-	.loc	5 105 15                ## ./c_kwlist_d.h:105:15
-	movl	%edx, %ebx
-Ltmp22:
+Ltmp21:
 	.loc	5 100 2                 ## ./c_kwlist_d.h:100:2
 	testq	%r8, %r8
-	je	LBB0_10
-Ltmp23:
-## %bb.8:
+	je	LBB0_9
+Ltmp22:
+## %bb.7:
 	##DEBUG_VALUE: ScanCKeywordLookup:str <- $r15
 	##DEBUG_VALUE: ScanCKeywords_hash_func:key <- $r15
 	.loc	5 0 2 is_stmt 0         ## ./c_kwlist_d.h:0:2
 	xorl	%ecx, %ecx
-Ltmp24:
+Ltmp23:
 	.p2align	4, 0x90
-LBB0_9:                                 ## =>This Inner Loop Header: Depth=1
+LBB0_8:                                 ## =>This Inner Loop Header: Depth=1
 	##DEBUG_VALUE: ScanCKeywordLookup:str <- $r15
 	##DEBUG_VALUE: ScanCKeywords_hash_func:key <- $r15
 	##DEBUG_VALUE: ScanCKeywords_hash_func:keylen <- undef
-	##DEBUG_VALUE: ScanCKeywords_hash_func:a <- $esi
-	##DEBUG_VALUE: ScanCKeywords_hash_func:b <- $edx
+	##DEBUG_VALUE: ScanCKeywords_hash_func:a <- $ebx
+	##DEBUG_VALUE: ScanCKeywords_hash_func:b <- $esi
 	##DEBUG_VALUE: ScanCKeywords_hash_func:k <- undef
 	##DEBUG_VALUE: c <- undef
 	.loc	5 102 21 is_stmt 1      ## ./c_kwlist_d.h:102:21
-	movzbl	(%r10,%rcx), %eax
+	movzbl	(%r10,%rcx), %edx
 	.loc	5 104 9                 ## ./c_kwlist_d.h:104:9
+	movl	%ebx, %eax
+	shll	$8, %eax
+	addl	%ebx, %eax
+	.loc	5 104 15 is_stmt 0      ## ./c_kwlist_d.h:104:15
+	addl	%edx, %eax
+Ltmp24:
+	##DEBUG_VALUE: ScanCKeywords_hash_func:a <- $eax
+	.loc	5 105 9 is_stmt 1       ## ./c_kwlist_d.h:105:9
 	movl	%esi, %edi
-	shll	$5, %edi
-	subl	%esi, %edi
-	.loc	5 104 14 is_stmt 0      ## ./c_kwlist_d.h:104:14
-	addl	%eax, %edi
+	shll	$4, %edi
+	addl	%esi, %edi
+	.loc	5 105 14 is_stmt 0      ## ./c_kwlist_d.h:105:14
+	addl	%edx, %edi
 Ltmp25:
-	##DEBUG_VALUE: ScanCKeywords_hash_func:a <- $edi
-	.loc	5 105 9 is_stmt 1       ## ./c_kwlist_d.h:105:9
-	movl	%edx, %ebx
-	shll	$7, %ebx
-	subl	%edx, %ebx
-	.loc	5 105 15 is_stmt 0      ## ./c_kwlist_d.h:105:15
-	addl	%eax, %ebx
-Ltmp26:
 	##DEBUG_VALUE: ScanCKeywords_hash_func:k <- [DW_OP_plus_uconst 1, DW_OP_stack_value] undef
 	##DEBUG_VALUE: ScanCKeywords_hash_func:keylen <- [DW_OP_constu 1, DW_OP_minus, DW_OP_stack_value] undef
-	##DEBUG_VALUE: ScanCKeywords_hash_func:b <- $ebx
+	##DEBUG_VALUE: ScanCKeywords_hash_func:b <- $edi
 	.loc	5 100 2 is_stmt 1       ## ./c_kwlist_d.h:100:2
 	incq	%rcx
-	movl	%ebx, %edx
 	movl	%edi, %esi
+	movl	%eax, %ebx
 	cmpq	%rcx, %r8
-	jne	LBB0_9
-Ltmp27:
-LBB0_10:
+	jne	LBB0_8
+Ltmp26:
+LBB0_9:
 	##DEBUG_VALUE: ScanCKeywordLookup:str <- $r15
 	##DEBUG_VALUE: ScanCKeywords_hash_func:key <- $r15
 	.loc	5 107 13                ## ./c_kwlist_d.h:107:13
-	movl	%edi, %eax
-	imulq	$891408307, %rax, %rax  ## imm = 0x3521CFB3
-	shrq	$32, %rax
+	movl	%eax, %ecx
+	imulq	$891408307, %rcx, %rcx  ## imm = 0x3521CFB3
+	shrq	$32, %rcx
+	movl	%eax, %edx
+	subl	%ecx, %edx
+	shrl	%edx
+	addl	%ecx, %edx
+	shrl	$5, %edx
+	imull	$53, %edx, %ecx
+	subl	%ecx, %eax
 	movl	%edi, %ecx
-	subl	%eax, %ecx
-	shrl	%ecx
-	addl	%eax, %ecx
-	shrl	$5, %ecx
-	imull	$53, %ecx, %eax
-	subl	%eax, %edi
-	movl	%ebx, %eax
-	imulq	$891408307, %rax, %rax  ## imm = 0x3521CFB3
-	shrq	$32, %rax
-	movl	%ebx, %ecx
-	subl	%eax, %ecx
-	shrl	%ecx
-	addl	%eax, %ecx
-	shrl	$5, %ecx
-	imull	$53, %ecx, %eax
-	subl	%eax, %ebx
+	imulq	$891408307, %rcx, %rcx  ## imm = 0x3521CFB3
+	shrq	$32, %rcx
+	movl	%edi, %edx
+	subl	%ecx, %edx
+	shrl	%edx
+	addl	%ecx, %edx
+	shrl	$5, %edx
+	imull	$53, %edx, %ecx
+	subl	%ecx, %edi
+	jmp	LBB0_10
+Ltmp27:
+LBB0_2:
+	##DEBUG_VALUE: ScanCKeywords_hash_func:keylen <- $rax
+	##DEBUG_VALUE: ScanCKeywordLookup:len <- $rax
+	##DEBUG_VALUE: ScanCKeywordLookup:str <- $r15
+	##DEBUG_VALUE: ScanCKeywords_hash_func:key <- $r15
+	.loc	5 0 13 is_stmt 0        ## ./c_kwlist_d.h:0:13
+	xorl	%eax, %eax
 Ltmp28:
-LBB0_11:
+	xorl	%edi, %edi
+Ltmp29:
+LBB0_10:
 	##DEBUG_VALUE: ScanCKeywordLookup:str <- $r15
 	##DEBUG_VALUE: ScanCKeywords_hash_func:key <- $r15
-	.loc	5 107 9 is_stmt 0       ## ./c_kwlist_d.h:107:9
-	leaq	_ScanCKeywords_hash_func.h(%rip), %rax
-	movsbq	(%rdi,%rax), %rcx
+	.loc	5 107 9                 ## ./c_kwlist_d.h:107:9
+	leaq	_ScanCKeywords_hash_func.h(%rip), %rcx
+	movsbq	(%rax,%rcx), %rax
 	.loc	5 107 21                ## ./c_kwlist_d.h:107:21
-	movsbq	(%rbx,%rax), %rbx
+	movsbq	(%rdi,%rcx), %rbx
 	.loc	5 107 19                ## ./c_kwlist_d.h:107:19
-	addq	%rcx, %rbx
-Ltmp29:
+	addq	%rax, %rbx
+Ltmp30:
 	##DEBUG_VALUE: ScanCKeywordLookup:h <- $ebx
 	##DEBUG_VALUE: GetScanKeyword:n <- $ebx
 	.loc	6 57 12 is_stmt 1       ## c_keywords.c:57:12
 	cmpl	$25, %ebx
-	ja	LBB0_14
-Ltmp30:
-## %bb.12:
+	ja	LBB0_13
+Ltmp31:
+## %bb.11:
 	##DEBUG_VALUE: GetScanKeyword:n <- $ebx
 	##DEBUG_VALUE: ScanCKeywordLookup:h <- $ebx
 	##DEBUG_VALUE: ScanCKeywordLookup:str <- $r15
@@ -306,26 +301,26 @@ Ltmp30:
 	.loc	1 41 29 is_stmt 0       ## ../../../../src/include/common/kwlookup.h:41:29
 	leaq	_ScanCKeywords_kw_string(%rip), %rdi
 	addq	%rax, %rdi
-Ltmp31:
+Ltmp32:
 	##DEBUG_VALUE: ScanCKeywordLookup:kw <- $rdi
 	.loc	6 62 6 is_stmt 1        ## c_keywords.c:62:6
 	movq	%r15, %rsi
 	callq	_strcmp
-Ltmp32:
+Ltmp33:
 	.loc	6 62 22 is_stmt 0       ## c_keywords.c:62:22
 	testl	%eax, %eax
-Ltmp33:
-	.loc	6 62 6                  ## c_keywords.c:62:6
-	jne	LBB0_14
 Ltmp34:
-## %bb.13:
+	.loc	6 62 6                  ## c_keywords.c:62:6
+	jne	LBB0_13
+Ltmp35:
+## %bb.12:
 	##DEBUG_VALUE: ScanCKeywordLookup:h <- $ebx
 	##DEBUG_VALUE: ScanCKeywordLookup:str <- $r15
 	.loc	6 63 10 is_stmt 1       ## c_keywords.c:63:10
 	leaq	_ScanCKeywordTokens(%rip), %rax
 	movzwl	(%rax,%rbx,2), %r14d
-Ltmp35:
-LBB0_14:
+Ltmp36:
+LBB0_13:
 	##DEBUG_VALUE: ScanCKeywordLookup:str <- $r15
 	.loc	6 66 1                  ## c_keywords.c:66:1
 	movl	%r14d, %eax
@@ -333,10 +328,10 @@ LBB0_14:
 	popq	%rbx
 	popq	%r14
 	popq	%r15
-Ltmp36:
+Ltmp37:
 	popq	%rbp
 	retq
-Ltmp37:
+Ltmp38:
 Lfunc_end0:
 	.cfi_endproc
                                         ## -- End function
@@ -405,7 +400,7 @@ _ScanCKeywords_kw_offsets:
 
 	.p2align	4               ## @ScanCKeywords_hash_func.h
 _ScanCKeywords_hash_func.h:
-	.ascii	"\030\016\000\n\023\002\013\003\006\177\177\177\177\002\000\177\000\t\177\177\177\177\021\177\000\001\005\000\000\364\025\r\177\177\000\177\177\000\177\007\177\020\002\000\n\000\000\003\000\004\000\022\024"
+	.asciz	"\373\000\177\367\000\177\177\003\177\017\177\177\177\177\013\020\001\000\006\020\t\005\177\000\177\024\030\373\005\022\005\022\002\177\177\177\024\177\357\000\177\002\177\006\177\366\f\023\000\000\000\177"
 
 	.section	__DWARF,__debug_str,regular,debug
 Linfo_string:
@@ -438,10 +433,10 @@ Linfo_string:
 	.asciz	"ScanCKeywords_hash_func" ## string offset=418
 	.asciz	"key"                   ## string offset=442
 	.asciz	"keylen"                ## string offset=446
-	.asciz	"a"                     ## string offset=453
+	.asciz	"b"                     ## string offset=453
 	.asciz	"uint32"                ## string offset=455
 	.asciz	"unsigned int"          ## string offset=462
-	.asciz	"b"                     ## string offset=475
+	.asciz	"a"                     ## string offset=475
 	.asciz	"k"                     ## string offset=477
 	.asciz	"c"                     ## string offset=479
 	.asciz	"GetScanKeyword"        ## string offset=481
@@ -462,7 +457,7 @@ Ldebug_loc0:
 	.byte	85                      ## DW_OP_reg5
 .set Lset2, Ltmp1-Lfunc_begin0
 	.quad	Lset2
-.set Lset3, Ltmp36-Lfunc_begin0
+.set Lset3, Ltmp37-Lfunc_begin0
 	.quad	Lset3
 	.short	1                       ## Loc expr size
 	.byte	95                      ## DW_OP_reg15
@@ -477,7 +472,7 @@ Ldebug_loc1:
 	.byte	85                      ## DW_OP_reg5
 .set Lset6, Ltmp1-Lfunc_begin0
 	.quad	Lset6
-.set Lset7, Ltmp30-Lfunc_begin0
+.set Lset7, Ltmp31-Lfunc_begin0
 	.quad	Lset7
 	.short	1                       ## Loc expr size
 	.byte	95                      ## DW_OP_reg15
@@ -486,157 +481,169 @@ Ldebug_loc1:
 Ldebug_loc2:
 .set Lset8, Ltmp2-Lfunc_begin0
 	.quad	Lset8
-.set Lset9, Ltmp16-Lfunc_begin0
+.set Lset9, Ltmp10-Lfunc_begin0
 	.quad	Lset9
 	.short	1                       ## Loc expr size
 	.byte	80                      ## DW_OP_reg0
-	.quad	0
-	.quad	0
-Ldebug_loc3:
-.set Lset10, Ltmp2-Lfunc_begin0
+.set Lset10, Ltmp27-Lfunc_begin0
 	.quad	Lset10
-.set Lset11, Ltmp10-Lfunc_begin0
+.set Lset11, Ltmp28-Lfunc_begin0
 	.quad	Lset11
 	.short	1                       ## Loc expr size
 	.byte	80                      ## DW_OP_reg0
 	.quad	0
 	.quad	0
-Ldebug_loc4:
-.set Lset12, Ltmp5-Lfunc_begin0
+Ldebug_loc3:
+.set Lset12, Ltmp2-Lfunc_begin0
 	.quad	Lset12
-.set Lset13, Ltmp10-Lfunc_begin0
+.set Lset13, Ltmp9-Lfunc_begin0
 	.quad	Lset13
-	.short	2                       ## Loc expr size
-	.byte	49                      ## DW_OP_lit1
-	.byte	159                     ## DW_OP_stack_value
-.set Lset14, Ltmp10-Lfunc_begin0
+	.short	1                       ## Loc expr size
+	.byte	80                      ## DW_OP_reg0
+.set Lset14, Ltmp27-Lfunc_begin0
 	.quad	Lset14
-.set Lset15, Ltmp11-Lfunc_begin0
+.set Lset15, Ltmp28-Lfunc_begin0
 	.quad	Lset15
 	.short	1                       ## Loc expr size
-	.byte	84                      ## super-register DW_OP_reg4
-.set Lset16, Ltmp11-Lfunc_begin0
+	.byte	80                      ## DW_OP_reg0
+	.quad	0
+	.quad	0
+Ldebug_loc4:
+.set Lset16, Ltmp6-Lfunc_begin0
 	.quad	Lset16
-.set Lset17, Ltmp13-Lfunc_begin0
+.set Lset17, Ltmp9-Lfunc_begin0
 	.quad	Lset17
-	.short	1                       ## Loc expr size
-	.byte	83                      ## super-register DW_OP_reg3
-.set Lset18, Ltmp13-Lfunc_begin0
+	.short	2                       ## Loc expr size
+	.byte	48                      ## DW_OP_lit0
+	.byte	159                     ## DW_OP_stack_value
+.set Lset18, Ltmp9-Lfunc_begin0
 	.quad	Lset18
-.set Lset19, Ltmp15-Lfunc_begin0
+.set Lset19, Ltmp12-Lfunc_begin0
 	.quad	Lset19
 	.short	1                       ## Loc expr size
-	.byte	81                      ## super-register DW_OP_reg1
-.set Lset20, Ltmp15-Lfunc_begin0
+	.byte	84                      ## super-register DW_OP_reg4
+.set Lset20, Ltmp12-Lfunc_begin0
 	.quad	Lset20
-.set Lset21, Ltmp19-Lfunc_begin0
+.set Lset21, Ltmp14-Lfunc_begin0
 	.quad	Lset21
 	.short	1                       ## Loc expr size
-	.byte	85                      ## super-register DW_OP_reg5
-.set Lset22, Ltmp19-Lfunc_begin0
+	.byte	83                      ## super-register DW_OP_reg3
+.set Lset22, Ltmp14-Lfunc_begin0
 	.quad	Lset22
-.set Lset23, Ltmp21-Lfunc_begin0
+.set Lset23, Ltmp16-Lfunc_begin0
 	.quad	Lset23
 	.short	1                       ## Loc expr size
-	.byte	84                      ## super-register DW_OP_reg4
-.set Lset24, Ltmp24-Lfunc_begin0
+	.byte	82                      ## super-register DW_OP_reg2
+.set Lset24, Ltmp16-Lfunc_begin0
 	.quad	Lset24
-.set Lset25, Ltmp25-Lfunc_begin0
+.set Lset25, Ltmp19-Lfunc_begin0
 	.quad	Lset25
 	.short	1                       ## Loc expr size
-	.byte	84                      ## super-register DW_OP_reg4
-.set Lset26, Ltmp25-Lfunc_begin0
+	.byte	81                      ## super-register DW_OP_reg1
+.set Lset26, Ltmp19-Lfunc_begin0
 	.quad	Lset26
-.set Lset27, Ltmp27-Lfunc_begin0
+.set Lset27, Ltmp20-Lfunc_begin0
 	.quad	Lset27
 	.short	1                       ## Loc expr size
-	.byte	85                      ## super-register DW_OP_reg5
-	.quad	0
-	.quad	0
-Ldebug_loc5:
-.set Lset28, Ltmp5-Lfunc_begin0
+	.byte	84                      ## super-register DW_OP_reg4
+.set Lset28, Ltmp23-Lfunc_begin0
 	.quad	Lset28
-.set Lset29, Ltmp10-Lfunc_begin0
+.set Lset29, Ltmp25-Lfunc_begin0
 	.quad	Lset29
-	.short	2                       ## Loc expr size
-	.byte	50                      ## DW_OP_lit2
-	.byte	159                     ## DW_OP_stack_value
-.set Lset30, Ltmp10-Lfunc_begin0
+	.short	1                       ## Loc expr size
+	.byte	84                      ## super-register DW_OP_reg4
+.set Lset30, Ltmp25-Lfunc_begin0
 	.quad	Lset30
-.set Lset31, Ltmp12-Lfunc_begin0
+.set Lset31, Ltmp26-Lfunc_begin0
 	.quad	Lset31
 	.short	1                       ## Loc expr size
-	.byte	81                      ## super-register DW_OP_reg1
-.set Lset32, Ltmp12-Lfunc_begin0
+	.byte	85                      ## super-register DW_OP_reg5
+	.quad	0
+	.quad	0
+Ldebug_loc5:
+.set Lset32, Ltmp6-Lfunc_begin0
 	.quad	Lset32
-.set Lset33, Ltmp14-Lfunc_begin0
+.set Lset33, Ltmp9-Lfunc_begin0
 	.quad	Lset33
-	.short	1                       ## Loc expr size
-	.byte	84                      ## super-register DW_OP_reg4
-.set Lset34, Ltmp14-Lfunc_begin0
+	.short	2                       ## Loc expr size
+	.byte	48                      ## DW_OP_lit0
+	.byte	159                     ## DW_OP_stack_value
+.set Lset34, Ltmp9-Lfunc_begin0
 	.quad	Lset34
-.set Lset35, Ltmp17-Lfunc_begin0
+.set Lset35, Ltmp11-Lfunc_begin0
 	.quad	Lset35
 	.short	1                       ## Loc expr size
 	.byte	83                      ## super-register DW_OP_reg3
-.set Lset36, Ltmp17-Lfunc_begin0
+.set Lset36, Ltmp11-Lfunc_begin0
 	.quad	Lset36
-.set Lset37, Ltmp20-Lfunc_begin0
+.set Lset37, Ltmp13-Lfunc_begin0
 	.quad	Lset37
 	.short	1                       ## Loc expr size
-	.byte	80                      ## super-register DW_OP_reg0
-.set Lset38, Ltmp20-Lfunc_begin0
+	.byte	82                      ## super-register DW_OP_reg2
+.set Lset38, Ltmp13-Lfunc_begin0
 	.quad	Lset38
-.set Lset39, Ltmp21-Lfunc_begin0
+.set Lset39, Ltmp15-Lfunc_begin0
 	.quad	Lset39
 	.short	1                       ## Loc expr size
-	.byte	81                      ## super-register DW_OP_reg1
-.set Lset40, Ltmp24-Lfunc_begin0
+	.byte	84                      ## super-register DW_OP_reg4
+.set Lset40, Ltmp15-Lfunc_begin0
 	.quad	Lset40
-.set Lset41, Ltmp26-Lfunc_begin0
+.set Lset41, Ltmp18-Lfunc_begin0
 	.quad	Lset41
 	.short	1                       ## Loc expr size
-	.byte	81                      ## super-register DW_OP_reg1
-.set Lset42, Ltmp26-Lfunc_begin0
+	.byte	85                      ## super-register DW_OP_reg5
+.set Lset42, Ltmp18-Lfunc_begin0
 	.quad	Lset42
-.set Lset43, Ltmp27-Lfunc_begin0
+.set Lset43, Ltmp20-Lfunc_begin0
 	.quad	Lset43
 	.short	1                       ## Loc expr size
 	.byte	83                      ## super-register DW_OP_reg3
+.set Lset44, Ltmp23-Lfunc_begin0
+	.quad	Lset44
+.set Lset45, Ltmp24-Lfunc_begin0
+	.quad	Lset45
+	.short	1                       ## Loc expr size
+	.byte	83                      ## super-register DW_OP_reg3
+.set Lset46, Ltmp24-Lfunc_begin0
+	.quad	Lset46
+.set Lset47, Ltmp26-Lfunc_begin0
+	.quad	Lset47
+	.short	1                       ## Loc expr size
+	.byte	80                      ## super-register DW_OP_reg0
 	.quad	0
 	.quad	0
 Ldebug_loc6:
-.set Lset44, Ltmp10-Lfunc_begin0
-	.quad	Lset44
-.set Lset45, Ltmp21-Lfunc_begin0
-	.quad	Lset45
+.set Lset48, Ltmp9-Lfunc_begin0
+	.quad	Lset48
+.set Lset49, Ltmp20-Lfunc_begin0
+	.quad	Lset49
 	.short	1                       ## Loc expr size
 	.byte	90                      ## DW_OP_reg10
 	.quad	0
 	.quad	0
 Ldebug_loc7:
-.set Lset46, Ltmp29-Lfunc_begin0
-	.quad	Lset46
-.set Lset47, Ltmp35-Lfunc_begin0
-	.quad	Lset47
+.set Lset50, Ltmp30-Lfunc_begin0
+	.quad	Lset50
+.set Lset51, Ltmp36-Lfunc_begin0
+	.quad	Lset51
 	.short	1                       ## Loc expr size
 	.byte	83                      ## super-register DW_OP_reg3
 	.quad	0
 	.quad	0
 Ldebug_loc8:
-.set Lset48, Ltmp29-Lfunc_begin0
-	.quad	Lset48
-.set Lset49, Ltmp34-Lfunc_begin0
-	.quad	Lset49
+.set Lset52, Ltmp30-Lfunc_begin0
+	.quad	Lset52
+.set Lset53, Ltmp35-Lfunc_begin0
+	.quad	Lset53
 	.short	1                       ## Loc expr size
 	.byte	83                      ## super-register DW_OP_reg3
 	.quad	0
 	.quad	0
 Ldebug_loc9:
-.set Lset50, Ltmp31-Lfunc_begin0
-	.quad	Lset50
-.set Lset51, Ltmp32-Lfunc_begin0
-	.quad	Lset51
+.set Lset54, Ltmp32-Lfunc_begin0
+	.quad	Lset54
+.set Lset55, Ltmp33-Lfunc_begin0
+	.quad	Lset55
 	.short	1                       ## Loc expr size
 	.byte	85                      ## DW_OP_reg5
 	.quad	0
@@ -984,25 +991,25 @@ Lsection_abbrev:
 	.section	__DWARF,__debug_info,regular,debug
 Lsection_info:
 Lcu_begin0:
-.set Lset52, Ldebug_info_end0-Ldebug_info_start0 ## Length of Unit
-	.long	Lset52
+.set Lset56, Ldebug_info_end0-Ldebug_info_start0 ## Length of Unit
+	.long	Lset56
 Ldebug_info_start0:
 	.short	4                       ## DWARF version number
-.set Lset53, Lsection_abbrev-Lsection_abbrev ## Offset Into Abbrev. Section
-	.long	Lset53
+.set Lset57, Lsection_abbrev-Lsection_abbrev ## Offset Into Abbrev. Section
+	.long	Lset57
 	.byte	8                       ## Address Size (in bytes)
 	.byte	1                       ## Abbrev [1] 0xb:0x2ed DW_TAG_compile_unit
 	.long	0                       ## DW_AT_producer
 	.short	12                      ## DW_AT_language
 	.long	48                      ## DW_AT_name
-.set Lset54, Lline_table_start0-Lsection_line ## DW_AT_stmt_list
-	.long	Lset54
+.set Lset58, Lline_table_start0-Lsection_line ## DW_AT_stmt_list
+	.long	Lset58
 	.long	61                      ## DW_AT_comp_dir
                                         ## DW_AT_GNU_pubnames
                                         ## DW_AT_APPLE_optimized
 	.quad	Lfunc_begin0            ## DW_AT_low_pc
-.set Lset55, Lfunc_end0-Lfunc_begin0    ## DW_AT_high_pc
-	.long	Lset55
+.set Lset59, Lfunc_end0-Lfunc_begin0    ## DW_AT_high_pc
+	.long	Lset59
 	.byte	2                       ## Abbrev [2] 0x2a:0xb DW_TAG_variable
 	.long	125                     ## DW_AT_name
 	.long	53                      ## DW_AT_type
@@ -1204,12 +1211,12 @@ Ldebug_info_start0:
 	.byte	20                      ## Abbrev [20] 0x1ce:0xb DW_TAG_variable
 	.long	453                     ## DW_AT_name
 	.byte	5                       ## DW_AT_decl_file
-	.byte	97                      ## DW_AT_decl_line
+	.byte	98                      ## DW_AT_decl_line
 	.long	509                     ## DW_AT_type
 	.byte	20                      ## Abbrev [20] 0x1d9:0xb DW_TAG_variable
 	.long	475                     ## DW_AT_name
 	.byte	5                       ## DW_AT_decl_file
-	.byte	98                      ## DW_AT_decl_line
+	.byte	97                      ## DW_AT_decl_line
 	.long	509                     ## DW_AT_type
 	.byte	20                      ## Abbrev [20] 0x1e4:0xb DW_TAG_variable
 	.long	477                     ## DW_AT_name
@@ -1256,8 +1263,8 @@ Ldebug_info_start0:
 	.long	53                      ## DW_AT_type
 	.byte	22                      ## Abbrev [22] 0x238:0xbf DW_TAG_subprogram
 	.quad	Lfunc_begin0            ## DW_AT_low_pc
-.set Lset56, Lfunc_end0-Lfunc_begin0    ## DW_AT_high_pc
-	.long	Lset56
+.set Lset60, Lfunc_end0-Lfunc_begin0    ## DW_AT_high_pc
+	.long	Lset60
 	.byte	1                       ## DW_AT_frame_base
 	.byte	86
                                         ## DW_AT_call_all_calls
@@ -1269,77 +1276,77 @@ Ldebug_info_start0:
                                         ## DW_AT_external
                                         ## DW_AT_APPLE_optimized
 	.byte	23                      ## Abbrev [23] 0x251:0xf DW_TAG_formal_parameter
-.set Lset57, Ldebug_loc0-Lsection_debug_loc ## DW_AT_location
-	.long	Lset57
+.set Lset61, Ldebug_loc0-Lsection_debug_loc ## DW_AT_location
+	.long	Lset61
 	.long	526                     ## DW_AT_name
 	.byte	6                       ## DW_AT_decl_file
 	.byte	36                      ## DW_AT_decl_line
 	.long	138                     ## DW_AT_type
 	.byte	24                      ## Abbrev [24] 0x260:0xf DW_TAG_variable
-.set Lset58, Ldebug_loc2-Lsection_debug_loc ## DW_AT_location
-	.long	Lset58
+.set Lset62, Ldebug_loc2-Lsection_debug_loc ## DW_AT_location
+	.long	Lset62
 	.long	530                     ## DW_AT_name
 	.byte	6                       ## DW_AT_decl_file
 	.byte	38                      ## DW_AT_decl_line
 	.long	229                     ## DW_AT_type
 	.byte	24                      ## Abbrev [24] 0x26f:0xf DW_TAG_variable
-.set Lset59, Ldebug_loc7-Lsection_debug_loc ## DW_AT_location
-	.long	Lset59
+.set Lset63, Ldebug_loc7-Lsection_debug_loc ## DW_AT_location
+	.long	Lset63
 	.long	366                     ## DW_AT_name
 	.byte	6                       ## DW_AT_decl_file
 	.byte	39                      ## DW_AT_decl_line
 	.long	216                     ## DW_AT_type
 	.byte	24                      ## Abbrev [24] 0x27e:0xf DW_TAG_variable
-.set Lset60, Ldebug_loc9-Lsection_debug_loc ## DW_AT_location
-	.long	Lset60
+.set Lset64, Ldebug_loc9-Lsection_debug_loc ## DW_AT_location
+	.long	Lset64
 	.long	534                     ## DW_AT_name
 	.byte	6                       ## DW_AT_decl_file
 	.byte	40                      ## DW_AT_decl_line
 	.long	138                     ## DW_AT_type
 	.byte	25                      ## Abbrev [25] 0x28d:0x4c DW_TAG_inlined_subroutine
 	.long	428                     ## DW_AT_abstract_origin
-	.quad	Ltmp5                   ## DW_AT_low_pc
-.set Lset61, Ltmp29-Ltmp5               ## DW_AT_high_pc
-	.long	Lset61
+	.quad	Ltmp6                   ## DW_AT_low_pc
+.set Lset65, Ltmp30-Ltmp6               ## DW_AT_high_pc
+	.long	Lset65
 	.byte	6                       ## DW_AT_call_file
 	.byte	54                      ## DW_AT_call_line
 	.byte	26                      ## Abbrev [26] 0x2a0:0x9 DW_TAG_formal_parameter
-.set Lset62, Ldebug_loc1-Lsection_debug_loc ## DW_AT_location
-	.long	Lset62
+.set Lset66, Ldebug_loc1-Lsection_debug_loc ## DW_AT_location
+	.long	Lset66
 	.long	440                     ## DW_AT_abstract_origin
 	.byte	26                      ## Abbrev [26] 0x2a9:0x9 DW_TAG_formal_parameter
-.set Lset63, Ldebug_loc3-Lsection_debug_loc ## DW_AT_location
-	.long	Lset63
+.set Lset67, Ldebug_loc3-Lsection_debug_loc ## DW_AT_location
+	.long	Lset67
 	.long	451                     ## DW_AT_abstract_origin
 	.byte	27                      ## Abbrev [27] 0x2b2:0x9 DW_TAG_variable
-.set Lset64, Ldebug_loc4-Lsection_debug_loc ## DW_AT_location
-	.long	Lset64
+.set Lset68, Ldebug_loc4-Lsection_debug_loc ## DW_AT_location
+	.long	Lset68
 	.long	462                     ## DW_AT_abstract_origin
 	.byte	27                      ## Abbrev [27] 0x2bb:0x9 DW_TAG_variable
-.set Lset65, Ldebug_loc5-Lsection_debug_loc ## DW_AT_location
-	.long	Lset65
+.set Lset69, Ldebug_loc5-Lsection_debug_loc ## DW_AT_location
+	.long	Lset69
 	.long	473                     ## DW_AT_abstract_origin
 	.byte	27                      ## Abbrev [27] 0x2c4:0x9 DW_TAG_variable
-.set Lset66, Ldebug_loc6-Lsection_debug_loc ## DW_AT_location
-	.long	Lset66
+.set Lset70, Ldebug_loc6-Lsection_debug_loc ## DW_AT_location
+	.long	Lset70
 	.long	484                     ## DW_AT_abstract_origin
 	.byte	28                      ## Abbrev [28] 0x2cd:0xb DW_TAG_lexical_block
-.set Lset67, Ldebug_ranges0-Ldebug_range ## DW_AT_ranges
-	.long	Lset67
+.set Lset71, Ldebug_ranges0-Ldebug_range ## DW_AT_ranges
+	.long	Lset71
 	.byte	29                      ## Abbrev [29] 0x2d2:0x5 DW_TAG_variable
 	.long	496                     ## DW_AT_abstract_origin
 	.byte	0                       ## End Of Children Mark
 	.byte	0                       ## End Of Children Mark
 	.byte	25                      ## Abbrev [25] 0x2d9:0x1d DW_TAG_inlined_subroutine
 	.long	528                     ## DW_AT_abstract_origin
-	.quad	Ltmp30                  ## DW_AT_low_pc
-.set Lset68, Ltmp31-Ltmp30              ## DW_AT_high_pc
-	.long	Lset68
+	.quad	Ltmp31                  ## DW_AT_low_pc
+.set Lset72, Ltmp32-Ltmp31              ## DW_AT_high_pc
+	.long	Lset72
 	.byte	6                       ## DW_AT_call_file
 	.byte	60                      ## DW_AT_call_line
 	.byte	26                      ## Abbrev [26] 0x2ec:0x9 DW_TAG_formal_parameter
-.set Lset69, Ldebug_loc8-Lsection_debug_loc ## DW_AT_location
-	.long	Lset69
+.set Lset73, Ldebug_loc8-Lsection_debug_loc ## DW_AT_location
+	.long	Lset73
 	.long	540                     ## DW_AT_abstract_origin
 	.byte	0                       ## End Of Children Mark
 	.byte	0                       ## End Of Children Mark
@@ -1348,18 +1355,18 @@ Ldebug_info_end0:
 	.section	__DWARF,__debug_ranges,regular,debug
 Ldebug_range:
 Ldebug_ranges0:
-.set Lset70, Ltmp10-Lfunc_begin0
-	.quad	Lset70
-.set Lset71, Ltmp20-Lfunc_begin0
-	.quad	Lset71
-.set Lset72, Ltmp21-Lfunc_begin0
-	.quad	Lset72
-.set Lset73, Ltmp22-Lfunc_begin0
-	.quad	Lset73
-.set Lset74, Ltmp24-Lfunc_begin0
+.set Lset74, Ltmp9-Lfunc_begin0
 	.quad	Lset74
-.set Lset75, Ltmp26-Lfunc_begin0
+.set Lset75, Ltmp19-Lfunc_begin0
 	.quad	Lset75
+.set Lset76, Ltmp20-Lfunc_begin0
+	.quad	Lset76
+.set Lset77, Ltmp21-Lfunc_begin0
+	.quad	Lset77
+.set Lset78, Ltmp23-Lfunc_begin0
+	.quad	Lset78
+.set Lset79, Ltmp25-Lfunc_begin0
+	.quad	Lset79
 	.quad	0
 	.quad	0
 	.section	__DWARF,__debug_macinfo,regular,debug
@@ -1391,20 +1398,20 @@ Lnames_begin:
 	.long	-1268970906             ## Hash in Bucket 4
 	.long	-263601009              ## Hash in Bucket 4
 	.long	1073557084              ## Hash in Bucket 5
-.set Lset76, LNames6-Lnames_begin       ## Offset in Bucket 2
-	.long	Lset76
-.set Lset77, LNames3-Lnames_begin       ## Offset in Bucket 2
-	.long	Lset77
-.set Lset78, LNames2-Lnames_begin       ## Offset in Bucket 3
-	.long	Lset78
-.set Lset79, LNames5-Lnames_begin       ## Offset in Bucket 4
-	.long	Lset79
-.set Lset80, LNames0-Lnames_begin       ## Offset in Bucket 4
+.set Lset80, LNames6-Lnames_begin       ## Offset in Bucket 2
 	.long	Lset80
-.set Lset81, LNames4-Lnames_begin       ## Offset in Bucket 4
+.set Lset81, LNames3-Lnames_begin       ## Offset in Bucket 2
 	.long	Lset81
-.set Lset82, LNames1-Lnames_begin       ## Offset in Bucket 5
+.set Lset82, LNames2-Lnames_begin       ## Offset in Bucket 3
 	.long	Lset82
+.set Lset83, LNames5-Lnames_begin       ## Offset in Bucket 4
+	.long	Lset83
+.set Lset84, LNames0-Lnames_begin       ## Offset in Bucket 4
+	.long	Lset84
+.set Lset85, LNames4-Lnames_begin       ## Offset in Bucket 4
+	.long	Lset85
+.set Lset86, LNames1-Lnames_begin       ## Offset in Bucket 5
+	.long	Lset86
 LNames6:
 	.long	418                     ## ScanCKeywords_hash_func
 	.long	1                       ## Num DIEs
@@ -1512,36 +1519,36 @@ Ltypes_begin:
 	.long	2090147939              ## Hash in Bucket 14
 	.long	-851394017              ## Hash in Bucket 14
 	.long	-104093792              ## Hash in Bucket 14
-.set Lset83, Ltypes3-Ltypes_begin       ## Offset in Bucket 1
-	.long	Lset83
-.set Lset84, Ltypes11-Ltypes_begin      ## Offset in Bucket 2
-	.long	Lset84
-.set Lset85, Ltypes1-Ltypes_begin       ## Offset in Bucket 3
-	.long	Lset85
-.set Lset86, Ltypes6-Ltypes_begin       ## Offset in Bucket 3
-	.long	Lset86
-.set Lset87, Ltypes0-Ltypes_begin       ## Offset in Bucket 4
+.set Lset87, Ltypes3-Ltypes_begin       ## Offset in Bucket 1
 	.long	Lset87
-.set Lset88, Ltypes4-Ltypes_begin       ## Offset in Bucket 5
+.set Lset88, Ltypes11-Ltypes_begin      ## Offset in Bucket 2
 	.long	Lset88
-.set Lset89, Ltypes8-Ltypes_begin       ## Offset in Bucket 7
+.set Lset89, Ltypes1-Ltypes_begin       ## Offset in Bucket 3
 	.long	Lset89
-.set Lset90, Ltypes5-Ltypes_begin       ## Offset in Bucket 8
+.set Lset90, Ltypes6-Ltypes_begin       ## Offset in Bucket 3
 	.long	Lset90
-.set Lset91, Ltypes7-Ltypes_begin       ## Offset in Bucket 9
+.set Lset91, Ltypes0-Ltypes_begin       ## Offset in Bucket 4
 	.long	Lset91
-.set Lset92, Ltypes9-Ltypes_begin       ## Offset in Bucket 11
+.set Lset92, Ltypes4-Ltypes_begin       ## Offset in Bucket 5
 	.long	Lset92
-.set Lset93, Ltypes2-Ltypes_begin       ## Offset in Bucket 12
+.set Lset93, Ltypes8-Ltypes_begin       ## Offset in Bucket 7
 	.long	Lset93
-.set Lset94, Ltypes10-Ltypes_begin      ## Offset in Bucket 13
+.set Lset94, Ltypes5-Ltypes_begin       ## Offset in Bucket 8
 	.long	Lset94
-.set Lset95, Ltypes14-Ltypes_begin      ## Offset in Bucket 14
+.set Lset95, Ltypes7-Ltypes_begin       ## Offset in Bucket 9
 	.long	Lset95
-.set Lset96, Ltypes12-Ltypes_begin      ## Offset in Bucket 14
+.set Lset96, Ltypes9-Ltypes_begin       ## Offset in Bucket 11
 	.long	Lset96
-.set Lset97, Ltypes13-Ltypes_begin      ## Offset in Bucket 14
+.set Lset97, Ltypes2-Ltypes_begin       ## Offset in Bucket 12
 	.long	Lset97
+.set Lset98, Ltypes10-Ltypes_begin      ## Offset in Bucket 13
+	.long	Lset98
+.set Lset99, Ltypes14-Ltypes_begin      ## Offset in Bucket 14
+	.long	Lset99
+.set Lset100, Ltypes12-Ltypes_begin     ## Offset in Bucket 14
+	.long	Lset100
+.set Lset101, Ltypes13-Ltypes_begin     ## Offset in Bucket 14
+	.long	Lset101
 Ltypes3:
 	.long	181                     ## uint16
 	.long	1                       ## Num DIEs
@@ -1651,12 +1658,12 @@ Ltypes13:
 	.byte	0
 	.long	0
 	.section	__DWARF,__debug_gnu_pubn,regular,debug
-.set Lset98, LpubNames_end0-LpubNames_begin0 ## Length of Public Names Info
-	.long	Lset98
+.set Lset102, LpubNames_end0-LpubNames_begin0 ## Length of Public Names Info
+	.long	Lset102
 LpubNames_begin0:
 	.short	2                       ## DWARF Version
-.set Lset99, Lcu_begin0-Lsection_info   ## Offset of Compilation Unit Info
-	.long	Lset99
+.set Lset103, Lcu_begin0-Lsection_info  ## Offset of Compilation Unit Info
+	.long	Lset103
 	.long	760                     ## Compilation Unit Length
 	.long	42                      ## DIE offset
 	.byte	160                     ## Attributes: VARIABLE, STATIC
@@ -1685,12 +1692,12 @@ LpubNames_begin0:
 	.long	0                       ## End Mark
 LpubNames_end0:
 	.section	__DWARF,__debug_gnu_pubt,regular,debug
-.set Lset100, LpubTypes_end0-LpubTypes_begin0 ## Length of Public Types Info
-	.long	Lset100
+.set Lset104, LpubTypes_end0-LpubTypes_begin0 ## Length of Public Types Info
+	.long	Lset104
 LpubTypes_begin0:
 	.short	2                       ## DWARF Version
-.set Lset101, Lcu_begin0-Lsection_info  ## Offset of Compilation Unit Info
-	.long	Lset101
+.set Lset105, Lcu_begin0-Lsection_info  ## Offset of Compilation Unit Info
+	.long	Lset105
 	.long	760                     ## Compilation Unit Length
 	.long	371                     ## DIE offset
 	.byte	144                     ## Attributes: TYPE, STATIC
diff --git a/src/interfaces/ecpg/preproc/ecpg_keywords.s b/src/interfaces/ecpg/preproc/ecpg_keywords.s
index e99fd57052..94c098d190 100644
--- a/src/interfaces/ecpg/preproc/ecpg_keywords.s
+++ b/src/interfaces/ecpg/preproc/ecpg_keywords.s
@@ -111,7 +111,7 @@ Ltmp15:
 	##DEBUG_VALUE: ScanECPGKeywords_hash_func:k <- $rdi
 	xorl	%edx, %edx
 Ltmp16:
-	##DEBUG_VALUE: ScanECPGKeywords_hash_func:b <- 3
+	##DEBUG_VALUE: ScanECPGKeywords_hash_func:b <- 1
 	##DEBUG_VALUE: ScanECPGKeywords_hash_func:a <- 0
 	##DEBUG_VALUE: ScanECPGKeywords_hash_func:k <- $rdi
 	##DEBUG_VALUE: ScanECPGKeywords_hash_func:keylen <- $rsi
@@ -135,7 +135,7 @@ Ltmp18:
 	##DEBUG_VALUE: ScanECPGKeywords_hash_func:keylen <- $rsi
 	##DEBUG_VALUE: ScanECPGKeywords_hash_func:key <- $rdi
 	.loc	5 0 15                  ## ./ecpg_kwlist_d.h:0:15
-	movl	$381, %esi              ## imm = 0x17D
+	movl	$17, %esi
 Ltmp19:
                                         ## implicit-def: $eax
                                         ## implicit-def: $ecx
@@ -151,7 +151,7 @@ LBB1_1:
 	##DEBUG_VALUE: ScanECPGKeywords_hash_func:keylen <- $rsi
 	##DEBUG_VALUE: ScanECPGKeywords_hash_func:key <- $rdi
 	.loc	5 0 2                   ## ./ecpg_kwlist_d.h:0:2
-	movl	$3, %ecx
+	movl	$1, %ecx
 	xorl	%eax, %eax
 	jmp	LBB1_10
 Ltmp21:
@@ -163,7 +163,7 @@ LBB1_4:
 	movq	%r8, %r9
 	subq	%rsi, %r9
 	xorl	%eax, %eax
-	movl	$3, %ecx
+	movl	$1, %ecx
 Ltmp22:
 	.p2align	4, 0x90
 LBB1_5:                                 ## =>This Inner Loop Header: Depth=1
@@ -182,17 +182,17 @@ Ltmp23:
 	##DEBUG_VALUE: c <- $r10d
 	.loc	5 138 9 is_stmt 1       ## ./ecpg_kwlist_d.h:138:9
 	movl	%eax, %edx
-	shll	$5, %edx
-	subl	%eax, %edx
-	.loc	5 138 14 is_stmt 0      ## ./ecpg_kwlist_d.h:138:14
+	shll	$8, %edx
+	addl	%eax, %edx
+	.loc	5 138 15 is_stmt 0      ## ./ecpg_kwlist_d.h:138:15
 	addl	%r10d, %edx
 Ltmp24:
 	##DEBUG_VALUE: ScanECPGKeywords_hash_func:a <- $edx
 	.loc	5 139 9 is_stmt 1       ## ./ecpg_kwlist_d.h:139:9
 	movl	%ecx, %esi
-	shll	$7, %esi
-	subl	%ecx, %esi
-	.loc	5 139 15 is_stmt 0      ## ./ecpg_kwlist_d.h:139:15
+	shll	$4, %esi
+	addl	%ecx, %esi
+	.loc	5 139 14 is_stmt 0      ## ./ecpg_kwlist_d.h:139:14
 	addl	%r10d, %esi
 	.loc	5 136 21 is_stmt 1      ## ./ecpg_kwlist_d.h:136:21
 	movzbl	1(%rdi), %r10d
@@ -209,17 +209,17 @@ Ltmp27:
 	##DEBUG_VALUE: c <- $r10d
 	.loc	5 138 9 is_stmt 1       ## ./ecpg_kwlist_d.h:138:9
 	movl	%edx, %eax
-	shll	$5, %eax
-	subl	%edx, %eax
-	.loc	5 138 14 is_stmt 0      ## ./ecpg_kwlist_d.h:138:14
+	shll	$8, %eax
+	addl	%edx, %eax
+	.loc	5 138 15 is_stmt 0      ## ./ecpg_kwlist_d.h:138:15
 	addl	%r10d, %eax
 Ltmp28:
 	##DEBUG_VALUE: ScanECPGKeywords_hash_func:a <- $eax
 	.loc	5 139 9 is_stmt 1       ## ./ecpg_kwlist_d.h:139:9
 	movl	%esi, %ecx
-	shll	$7, %ecx
-	subl	%esi, %ecx
-	.loc	5 139 15 is_stmt 0      ## ./ecpg_kwlist_d.h:139:15
+	shll	$4, %ecx
+	addl	%esi, %ecx
+	.loc	5 139 14 is_stmt 0      ## ./ecpg_kwlist_d.h:139:14
 	addl	%r10d, %ecx
 Ltmp29:
 	##DEBUG_VALUE: ScanECPGKeywords_hash_func:keylen <- [DW_OP_constu 2, DW_OP_minus, DW_OP_stack_value] undef
@@ -233,11 +233,11 @@ Ltmp30:
 	##DEBUG_VALUE: ScanECPGKeywords_hash_func:a <- $eax
 	##DEBUG_VALUE: ScanECPGKeywords_hash_func:k <- $rdi
 	movl	%eax, %edx
-	shll	$5, %edx
-	subl	%eax, %edx
+	shll	$8, %edx
+	addl	%eax, %edx
 	movl	%ecx, %esi
-	shll	$7, %esi
-	subl	%ecx, %esi
+	shll	$4, %esi
+	addl	%ecx, %esi
 	##DEBUG_VALUE: ScanECPGKeywords_hash_func:k <- $rdi
 Ltmp31:
 	##DEBUG_VALUE: ScanECPGKeywords_hash_func:k <- [DW_OP_plus_uconst 1, DW_OP_stack_value] $rdi
@@ -252,17 +252,17 @@ LBB1_8:
 	orl	$32, %eax
 Ltmp33:
 	##DEBUG_VALUE: c <- $eax
-	.loc	5 139 15 is_stmt 1      ## ./ecpg_kwlist_d.h:139:15
+	.loc	5 139 14 is_stmt 1      ## ./ecpg_kwlist_d.h:139:14
 	addl	%eax, %esi
 Ltmp34:
 	##DEBUG_VALUE: ScanECPGKeywords_hash_func:b <- $esi
-	.loc	5 138 14                ## ./ecpg_kwlist_d.h:138:14
+	.loc	5 138 15                ## ./ecpg_kwlist_d.h:138:15
 	addl	%eax, %edx
 Ltmp35:
 	##DEBUG_VALUE: ScanECPGKeywords_hash_func:a <- $edx
 	movl	%edx, %eax
 Ltmp36:
-	.loc	5 139 15                ## ./ecpg_kwlist_d.h:139:15
+	.loc	5 139 14                ## ./ecpg_kwlist_d.h:139:14
 	movl	%esi, %ecx
 Ltmp37:
 	##DEBUG_VALUE: ScanECPGKeywords_hash_func:b <- $ecx
@@ -284,9 +284,9 @@ LBB1_10:
 	##DEBUG_VALUE: ScanECPGKeywords_hash_func:k <- $rdi
 	.loc	5 141 9 is_stmt 0       ## ./ecpg_kwlist_d.h:141:9
 	leaq	_ScanECPGKeywords_hash_func.h(%rip), %rdx
-	movswl	(%rdx,%rax,2), %esi
+	movsbl	(%rax,%rdx), %esi
 	.loc	5 141 21                ## ./ecpg_kwlist_d.h:141:21
-	movswl	(%rdx,%rcx,2), %eax
+	movsbl	(%rcx,%rdx), %eax
 	.loc	5 141 19                ## ./ecpg_kwlist_d.h:141:19
 	addl	%esi, %eax
 	.loc	5 141 2                 ## ./ecpg_kwlist_d.h:141:2
@@ -400,89 +400,7 @@ _ScanECPGKeywords_kw_offsets:
 
 	.p2align	4               ## @ScanECPGKeywords_hash_func.h
 _ScanECPGKeywords_hash_func.h:
-	.short	0                       ## 0x0
-	.short	26                      ## 0x1a
-	.short	65521                   ## 0xfff1
-	.short	29                      ## 0x1d
-	.short	8                       ## 0x8
-	.short	35                      ## 0x23
-	.short	65530                   ## 0xfffa
-	.short	32767                   ## 0x7fff
-	.short	11                      ## 0xb
-	.short	20                      ## 0x14
-	.short	0                       ## 0x0
-	.short	25                      ## 0x19
-	.short	4                       ## 0x4
-	.short	32767                   ## 0x7fff
-	.short	27                      ## 0x1b
-	.short	0                       ## 0x0
-	.short	32767                   ## 0x7fff
-	.short	32767                   ## 0x7fff
-	.short	32767                   ## 0x7fff
-	.short	32767                   ## 0x7fff
-	.short	0                       ## 0x0
-	.short	32767                   ## 0x7fff
-	.short	6                       ## 0x6
-	.short	32767                   ## 0x7fff
-	.short	65449                   ## 0xffa9
-	.short	43                      ## 0x2b
-	.short	32767                   ## 0x7fff
-	.short	0                       ## 0x0
-	.short	32767                   ## 0x7fff
-	.short	12                      ## 0xc
-	.short	32767                   ## 0x7fff
-	.short	7                       ## 0x7
-	.short	0                       ## 0x0
-	.short	32767                   ## 0x7fff
-	.short	0                       ## 0x0
-	.short	30                      ## 0x1e
-	.short	38                      ## 0x26
-	.short	23                      ## 0x17
-	.short	65468                   ## 0xffbc
-	.short	0                       ## 0x0
-	.short	32767                   ## 0x7fff
-	.short	9                       ## 0x9
-	.short	32767                   ## 0x7fff
-	.short	32767                   ## 0x7fff
-	.short	32767                   ## 0x7fff
-	.short	0                       ## 0x0
-	.short	16                      ## 0x10
-	.short	65518                   ## 0xffee
-	.short	65529                   ## 0xfff9
-	.short	32767                   ## 0x7fff
-	.short	19                      ## 0x13
-	.short	0                       ## 0x0
-	.short	68                      ## 0x44
-	.short	0                       ## 0x0
-	.short	96                      ## 0x60
-	.short	32767                   ## 0x7fff
-	.short	32767                   ## 0x7fff
-	.short	14                      ## 0xe
-	.short	0                       ## 0x0
-	.short	65518                   ## 0xffee
-	.short	32767                   ## 0x7fff
-	.short	65523                   ## 0xfff3
-	.short	32767                   ## 0x7fff
-	.short	32                      ## 0x20
-	.short	0                       ## 0x0
-	.short	29                      ## 0x1d
-	.short	65530                   ## 0xfffa
-	.short	78                      ## 0x4e
-	.short	32767                   ## 0x7fff
-	.short	32767                   ## 0x7fff
-	.short	39                      ## 0x27
-	.short	18                      ## 0x12
-	.short	65495                   ## 0xffd7
-	.short	32767                   ## 0x7fff
-	.short	0                       ## 0x0
-	.short	40                      ## 0x28
-	.short	65473                   ## 0xffc1
-	.short	22                      ## 0x16
-	.short	31                      ## 0x1f
-	.short	0                       ## 0x0
-	.short	32767                   ## 0x7fff
-	.short	32767                   ## 0x7fff
-	.short	32767                   ## 0x7fff
+	.ascii	"\366\374\177\000 \033\177\366\177%\344\177\003\037\177\357\177\177\375\177\177\000\017\177\177\"\177\177\177\030)\003\"\350\177\177\000\177\177\177\020\000!\177\177\177\016\177\177\022\000\177\177\374\354\025\000\000\036\005\000\177\027\006\177\362\177\1776\000\372\000\000\376$\f\000\364)\b\023\177\013"
 
 	.section	__DWARF,__debug_str,regular,debug
 Linfo_string:
@@ -508,22 +426,22 @@ Linfo_string:
 	.asciz	"__ARRAY_SIZE_TYPE__"   ## string offset=330
 	.asciz	"ScanECPGKeywords_kw_offsets" ## string offset=350
 	.asciz	"h"                     ## string offset=378
-	.asciz	"int16"                 ## string offset=380
-	.asciz	"short"                 ## string offset=386
-	.asciz	"ECPGScanKeywordTokens" ## string offset=392
-	.asciz	"unsigned char"         ## string offset=414
-	.asciz	"ScanECPGKeywordLookup" ## string offset=428
-	.asciz	"ScanECPGKeywords_hash_func" ## string offset=450
-	.asciz	"text"                  ## string offset=477
-	.asciz	"kwnum"                 ## string offset=482
-	.asciz	"key"                   ## string offset=488
-	.asciz	"keylen"                ## string offset=492
-	.asciz	"k"                     ## string offset=499
-	.asciz	"b"                     ## string offset=501
-	.asciz	"uint32"                ## string offset=503
-	.asciz	"unsigned int"          ## string offset=510
-	.asciz	"a"                     ## string offset=523
-	.asciz	"c"                     ## string offset=525
+	.asciz	"int8"                  ## string offset=380
+	.asciz	"signed char"           ## string offset=385
+	.asciz	"ECPGScanKeywordTokens" ## string offset=397
+	.asciz	"unsigned char"         ## string offset=419
+	.asciz	"ScanECPGKeywordLookup" ## string offset=433
+	.asciz	"ScanECPGKeywords_hash_func" ## string offset=455
+	.asciz	"text"                  ## string offset=482
+	.asciz	"kwnum"                 ## string offset=487
+	.asciz	"key"                   ## string offset=493
+	.asciz	"keylen"                ## string offset=497
+	.asciz	"k"                     ## string offset=504
+	.asciz	"b"                     ## string offset=506
+	.asciz	"uint32"                ## string offset=508
+	.asciz	"unsigned int"          ## string offset=515
+	.asciz	"a"                     ## string offset=528
+	.asciz	"c"                     ## string offset=530
 	.section	__DWARF,__debug_loc,regular,debug
 Lsection_debug_loc:
 Ldebug_loc0:
@@ -635,7 +553,7 @@ Ldebug_loc5:
 .set Lset29, Ltmp22-Lfunc_begin0
 	.quad	Lset29
 	.short	2                       ## Loc expr size
-	.byte	51                      ## DW_OP_lit3
+	.byte	49                      ## DW_OP_lit1
 	.byte	159                     ## DW_OP_stack_value
 .set Lset30, Ltmp22-Lfunc_begin0
 	.quad	Lset30
@@ -1153,7 +1071,7 @@ Ldebug_info_start0:
 	.byte	1                       ## DW_AT_frame_base
 	.byte	86
                                         ## DW_AT_call_all_calls
-	.long	450                     ## DW_AT_name
+	.long	455                     ## DW_AT_name
 	.byte	5                       ## DW_AT_decl_file
 	.byte	114                     ## DW_AT_decl_line
                                         ## DW_AT_prototyped
@@ -1170,35 +1088,35 @@ Ldebug_info_start0:
 	.byte	18                      ## Abbrev [18] 0x184:0xf DW_TAG_formal_parameter
 .set Lset59, Ldebug_loc2-Lsection_debug_loc ## DW_AT_location
 	.long	Lset59
-	.long	488                     ## DW_AT_name
+	.long	493                     ## DW_AT_name
 	.byte	5                       ## DW_AT_decl_file
 	.byte	114                     ## DW_AT_decl_line
 	.long	233                     ## DW_AT_type
 	.byte	18                      ## Abbrev [18] 0x193:0xf DW_TAG_formal_parameter
 .set Lset60, Ldebug_loc3-Lsection_debug_loc ## DW_AT_location
 	.long	Lset60
-	.long	492                     ## DW_AT_name
+	.long	497                     ## DW_AT_name
 	.byte	5                       ## DW_AT_decl_file
 	.byte	114                     ## DW_AT_decl_line
 	.long	239                     ## DW_AT_type
 	.byte	19                      ## Abbrev [19] 0x1a2:0xf DW_TAG_variable
 .set Lset61, Ldebug_loc4-Lsection_debug_loc ## DW_AT_location
 	.long	Lset61
-	.long	499                     ## DW_AT_name
+	.long	504                     ## DW_AT_name
 	.byte	5                       ## DW_AT_decl_file
 	.byte	130                     ## DW_AT_decl_line
 	.long	542                     ## DW_AT_type
 	.byte	19                      ## Abbrev [19] 0x1b1:0xf DW_TAG_variable
 .set Lset62, Ldebug_loc5-Lsection_debug_loc ## DW_AT_location
 	.long	Lset62
-	.long	501                     ## DW_AT_name
+	.long	506                     ## DW_AT_name
 	.byte	5                       ## DW_AT_decl_file
 	.byte	132                     ## DW_AT_decl_line
 	.long	615                     ## DW_AT_type
 	.byte	19                      ## Abbrev [19] 0x1c0:0xf DW_TAG_variable
 .set Lset63, Ldebug_loc6-Lsection_debug_loc ## DW_AT_location
 	.long	Lset63
-	.long	523                     ## DW_AT_name
+	.long	528                     ## DW_AT_name
 	.byte	5                       ## DW_AT_decl_file
 	.byte	131                     ## DW_AT_decl_line
 	.long	615                     ## DW_AT_type
@@ -1208,7 +1126,7 @@ Ldebug_info_start0:
 	.byte	19                      ## Abbrev [19] 0x1d4:0xf DW_TAG_variable
 .set Lset65, Ldebug_loc7-Lsection_debug_loc ## DW_AT_location
 	.long	Lset65
-	.long	525                     ## DW_AT_name
+	.long	530                     ## DW_AT_name
 	.byte	5                       ## DW_AT_decl_file
 	.byte	136                     ## DW_AT_decl_line
 	.long	552                     ## DW_AT_type
@@ -1226,13 +1144,13 @@ Ldebug_info_start0:
 	.long	514                     ## DW_AT_type
 	.long	380                     ## DW_AT_name
 	.byte	2                       ## DW_AT_decl_file
-	.short	361                     ## DW_AT_decl_line
+	.short	360                     ## DW_AT_decl_line
 	.byte	8                       ## Abbrev [8] 0x202:0x7 DW_TAG_base_type
-	.long	386                     ## DW_AT_name
-	.byte	5                       ## DW_AT_encoding
-	.byte	2                       ## DW_AT_byte_size
+	.long	385                     ## DW_AT_name
+	.byte	6                       ## DW_AT_encoding
+	.byte	1                       ## DW_AT_byte_size
 	.byte	2                       ## Abbrev [2] 0x209:0x15 DW_TAG_variable
-	.long	392                     ## DW_AT_name
+	.long	397                     ## DW_AT_name
 	.long	330                     ## DW_AT_type
 	.byte	6                       ## DW_AT_decl_file
 	.byte	24                      ## DW_AT_decl_line
@@ -1244,7 +1162,7 @@ Ldebug_info_start0:
 	.byte	3                       ## Abbrev [3] 0x223:0x5 DW_TAG_const_type
 	.long	552                     ## DW_AT_type
 	.byte	8                       ## Abbrev [8] 0x228:0x7 DW_TAG_base_type
-	.long	414                     ## DW_AT_name
+	.long	419                     ## DW_AT_name
 	.byte	8                       ## DW_AT_encoding
 	.byte	1                       ## DW_AT_byte_size
 	.byte	21                      ## Abbrev [21] 0x22f:0x38 DW_TAG_subprogram
@@ -1254,7 +1172,7 @@ Ldebug_info_start0:
 	.byte	1                       ## DW_AT_frame_base
 	.byte	86
                                         ## DW_AT_call_all_calls
-	.long	428                     ## DW_AT_name
+	.long	433                     ## DW_AT_name
 	.byte	6                       ## DW_AT_decl_file
 	.byte	39                      ## DW_AT_decl_line
                                         ## DW_AT_prototyped
@@ -1264,25 +1182,25 @@ Ldebug_info_start0:
 	.byte	18                      ## Abbrev [18] 0x248:0xf DW_TAG_formal_parameter
 .set Lset67, Ldebug_loc0-Lsection_debug_loc ## DW_AT_location
 	.long	Lset67
-	.long	477                     ## DW_AT_name
+	.long	482                     ## DW_AT_name
 	.byte	6                       ## DW_AT_decl_file
 	.byte	39                      ## DW_AT_decl_line
 	.long	148                     ## DW_AT_type
 	.byte	19                      ## Abbrev [19] 0x257:0xf DW_TAG_variable
 .set Lset68, Ldebug_loc1-Lsection_debug_loc ## DW_AT_location
 	.long	Lset68
-	.long	482                     ## DW_AT_name
+	.long	487                     ## DW_AT_name
 	.byte	6                       ## DW_AT_decl_file
 	.byte	41                      ## DW_AT_decl_line
 	.long	226                     ## DW_AT_type
 	.byte	0                       ## End Of Children Mark
 	.byte	9                       ## Abbrev [9] 0x267:0xc DW_TAG_typedef
 	.long	627                     ## DW_AT_type
-	.long	503                     ## DW_AT_name
+	.long	508                     ## DW_AT_name
 	.byte	2                       ## DW_AT_decl_file
 	.short	374                     ## DW_AT_decl_line
 	.byte	8                       ## Abbrev [8] 0x273:0x7 DW_TAG_base_type
-	.long	510                     ## DW_AT_name
+	.long	515                     ## DW_AT_name
 	.byte	7                       ## DW_AT_encoding
 	.byte	4                       ## DW_AT_byte_size
 	.byte	0                       ## End Of Children Mark
@@ -1349,7 +1267,7 @@ LNames2:
 	.long	309
 	.long	0
 LNames6:
-	.long	392                     ## ECPGScanKeywordTokens
+	.long	397                     ## ECPGScanKeywordTokens
 	.long	1                       ## Num DIEs
 	.long	521
 	.long	0
@@ -1369,12 +1287,12 @@ LNames3:
 	.long	367
 	.long	0
 LNames1:
-	.long	428                     ## ScanECPGKeywordLookup
+	.long	433                     ## ScanECPGKeywordLookup
 	.long	1                       ## Num DIEs
 	.long	559
 	.long	0
 LNames4:
-	.long	450                     ## ScanECPGKeywords_hash_func
+	.long	455                     ## ScanECPGKeywords_hash_func
 	.long	1                       ## Num DIEs
 	.long	342
 	.long	0
@@ -1433,46 +1351,46 @@ Ltypes_begin:
 	.long	-1                      ## Bucket 10
 	.long	9                       ## Bucket 11
 	.long	10                      ## Bucket 12
-	.long	-1                      ## Bucket 13
-	.long	11                      ## Bucket 14
+	.long	11                      ## Bucket 13
+	.long	12                      ## Bucket 14
 	.long	544532716               ## Hash in Bucket 1
 	.long	-80380739               ## Hash in Bucket 2
 	.long	544532778               ## Hash in Bucket 3
 	.long	878862258               ## Hash in Bucket 3
-	.long	274395349               ## Hash in Bucket 4
+	.long	2090370664              ## Hash in Bucket 4
 	.long	-1304652851             ## Hash in Bucket 5
 	.long	-282664779              ## Hash in Bucket 7
 	.long	193495088               ## Hash in Bucket 8
 	.long	466678419               ## Hash in Bucket 9
 	.long	-594775205              ## Hash in Bucket 11
 	.long	-1943928469             ## Hash in Bucket 12
-	.long	262754999               ## Hash in Bucket 14
+	.long	691577533               ## Hash in Bucket 13
 	.long	2090147939              ## Hash in Bucket 14
 	.long	-851394017              ## Hash in Bucket 14
 	.long	-104093792              ## Hash in Bucket 14
-.set Lset80, Ltypes2-Ltypes_begin       ## Offset in Bucket 1
+.set Lset80, Ltypes3-Ltypes_begin       ## Offset in Bucket 1
 	.long	Lset80
 .set Lset81, Ltypes11-Ltypes_begin      ## Offset in Bucket 2
 	.long	Lset81
-.set Lset82, Ltypes0-Ltypes_begin       ## Offset in Bucket 3
+.set Lset82, Ltypes1-Ltypes_begin       ## Offset in Bucket 3
 	.long	Lset82
-.set Lset83, Ltypes5-Ltypes_begin       ## Offset in Bucket 3
+.set Lset83, Ltypes6-Ltypes_begin       ## Offset in Bucket 3
 	.long	Lset83
-.set Lset84, Ltypes8-Ltypes_begin       ## Offset in Bucket 4
+.set Lset84, Ltypes0-Ltypes_begin       ## Offset in Bucket 4
 	.long	Lset84
-.set Lset85, Ltypes3-Ltypes_begin       ## Offset in Bucket 5
+.set Lset85, Ltypes4-Ltypes_begin       ## Offset in Bucket 5
 	.long	Lset85
-.set Lset86, Ltypes7-Ltypes_begin       ## Offset in Bucket 7
+.set Lset86, Ltypes8-Ltypes_begin       ## Offset in Bucket 7
 	.long	Lset86
-.set Lset87, Ltypes4-Ltypes_begin       ## Offset in Bucket 8
+.set Lset87, Ltypes5-Ltypes_begin       ## Offset in Bucket 8
 	.long	Lset87
-.set Lset88, Ltypes6-Ltypes_begin       ## Offset in Bucket 9
+.set Lset88, Ltypes7-Ltypes_begin       ## Offset in Bucket 9
 	.long	Lset88
-.set Lset89, Ltypes10-Ltypes_begin      ## Offset in Bucket 11
+.set Lset89, Ltypes9-Ltypes_begin       ## Offset in Bucket 11
 	.long	Lset89
-.set Lset90, Ltypes1-Ltypes_begin       ## Offset in Bucket 12
+.set Lset90, Ltypes2-Ltypes_begin       ## Offset in Bucket 12
 	.long	Lset90
-.set Lset91, Ltypes9-Ltypes_begin       ## Offset in Bucket 14
+.set Lset91, Ltypes10-Ltypes_begin      ## Offset in Bucket 13
 	.long	Lset91
 .set Lset92, Ltypes14-Ltypes_begin      ## Offset in Bucket 14
 	.long	Lset92
@@ -1480,7 +1398,7 @@ Ltypes_begin:
 	.long	Lset93
 .set Lset94, Ltypes13-Ltypes_begin      ## Offset in Bucket 14
 	.long	Lset94
-Ltypes2:
+Ltypes3:
 	.long	187                     ## uint16
 	.long	1                       ## Num DIEs
 	.long	175
@@ -1494,63 +1412,63 @@ Ltypes11:
 	.short	36
 	.byte	0
 	.long	0
-Ltypes0:
-	.long	503                     ## uint32
+Ltypes1:
+	.long	508                     ## uint32
 	.long	1                       ## Num DIEs
 	.long	615
 	.short	22
 	.byte	0
 	.long	0
-Ltypes5:
+Ltypes6:
 	.long	194                     ## unsigned short
 	.long	1                       ## Num DIEs
 	.long	187
 	.short	36
 	.byte	0
 	.long	0
-Ltypes8:
-	.long	386                     ## short
+Ltypes0:
+	.long	380                     ## int8
 	.long	1                       ## Num DIEs
-	.long	514
-	.short	36
+	.long	502
+	.short	22
 	.byte	0
 	.long	0
-Ltypes3:
-	.long	510                     ## unsigned int
+Ltypes4:
+	.long	515                     ## unsigned int
 	.long	1                       ## Num DIEs
 	.long	627
 	.short	36
 	.byte	0
 	.long	0
-Ltypes7:
+Ltypes8:
 	.long	245                     ## __darwin_size_t
 	.long	1                       ## Num DIEs
 	.long	250
 	.short	22
 	.byte	0
 	.long	0
-Ltypes4:
+Ltypes5:
 	.long	234                     ## int
 	.long	1                       ## Num DIEs
 	.long	226
 	.short	36
 	.byte	0
 	.long	0
-Ltypes6:
+Ltypes7:
 	.long	238                     ## size_t
 	.long	1                       ## Num DIEs
 	.long	239
 	.short	22
 	.byte	0
 	.long	0
-Ltypes10:
+Ltypes9:
 	.long	330                     ## __ARRAY_SIZE_TYPE__
 	.long	1                       ## Num DIEs
 	.long	302
 	.short	36
 	.byte	0
 	.long	0
-Ltypes1:
+Ltypes2:
 	.long	145                     ## ScanKeywordList
 	.long	2                       ## Num DIEs
 	.long	68
@@ -1560,11 +1478,11 @@ Ltypes1:
 	.short	19
 	.byte	0
 	.long	0
-Ltypes9:
-	.long	380                     ## int16
+Ltypes10:
+	.long	385                     ## signed char
 	.long	1                       ## Num DIEs
-	.long	502
-	.short	22
+	.long	514
+	.short	36
 	.byte	0
 	.long	0
 Ltypes14:
@@ -1582,7 +1500,7 @@ Ltypes12:
 	.byte	0
 	.long	0
 Ltypes13:
-	.long	414                     ## unsigned char
+	.long	419                     ## unsigned char
 	.long	1                       ## Num DIEs
 	.long	552
 	.short	36
@@ -1627,6 +1545,9 @@ LpubTypes_begin0:
 .set Lset98, Lcu_begin0-Lsection_info   ## Offset of Compilation Unit Info
 	.long	Lset98
 	.long	635                     ## Compilation Unit Length
+	.long	502                     ## DIE offset
+	.byte	144                     ## Attributes: TYPE, STATIC
+	.asciz	"int8"                  ## External Name
 	.long	615                     ## DIE offset
 	.byte	144                     ## Attributes: TYPE, STATIC
 	.asciz	"uint32"                ## External Name
@@ -1651,15 +1572,12 @@ LpubTypes_begin0:
 	.long	250                     ## DIE offset
 	.byte	144                     ## Attributes: TYPE, STATIC
 	.asciz	"__darwin_size_t"       ## External Name
-	.long	514                     ## DIE offset
-	.byte	144                     ## Attributes: TYPE, STATIC
-	.asciz	"short"                 ## External Name
-	.long	502                     ## DIE offset
-	.byte	144                     ## Attributes: TYPE, STATIC
-	.asciz	"int16"                 ## External Name
 	.long	261                     ## DIE offset
 	.byte	144                     ## Attributes: TYPE, STATIC
 	.asciz	"long unsigned int"     ## External Name
+	.long	514                     ## DIE offset
+	.byte	144                     ## Attributes: TYPE, STATIC
+	.asciz	"signed char"           ## External Name
 	.long	194                     ## DIE offset
 	.byte	144                     ## Attributes: TYPE, STATIC
 	.asciz	"ScanKeywordHashFunc"   ## External Name
diff --git a/src/pl/plpgsql/src/pl_scanner.s b/src/pl/plpgsql/src/pl_scanner.s
index 8095fd18ec..323d282743 100644
--- a/src/pl/plpgsql/src/pl_scanner.s
+++ b/src/pl/plpgsql/src/pl_scanner.s
@@ -1736,7 +1736,7 @@ Ltmp211:
 	##DEBUG_VALUE: UnreservedPLKeywords_hash_func:k <- $rdi
 	xorl	%edx, %edx
 Ltmp212:
-	##DEBUG_VALUE: UnreservedPLKeywords_hash_func:b <- 1
+	##DEBUG_VALUE: UnreservedPLKeywords_hash_func:b <- 3
 	##DEBUG_VALUE: UnreservedPLKeywords_hash_func:a <- 0
 	##DEBUG_VALUE: UnreservedPLKeywords_hash_func:k <- $rdi
 	##DEBUG_VALUE: UnreservedPLKeywords_hash_func:keylen <- $rsi
@@ -1760,7 +1760,7 @@ Ltmp214:
 	##DEBUG_VALUE: UnreservedPLKeywords_hash_func:keylen <- $rsi
 	##DEBUG_VALUE: UnreservedPLKeywords_hash_func:key <- $rdi
 	.loc	8 0 15                  ## ./pl_unreserved_kwlist_d.h:0:15
-	movl	$127, %esi
+	movl	$51, %esi
 Ltmp215:
                                         ## implicit-def: $eax
                                         ## implicit-def: $ecx
@@ -1776,7 +1776,7 @@ LBB13_1:
 	##DEBUG_VALUE: UnreservedPLKeywords_hash_func:keylen <- $rsi
 	##DEBUG_VALUE: UnreservedPLKeywords_hash_func:key <- $rdi
 	.loc	8 0 2                   ## ./pl_unreserved_kwlist_d.h:0:2
-	movl	$1, %ecx
+	movl	$3, %ecx
 	xorl	%eax, %eax
 	jmp	LBB13_10
 Ltmp217:
@@ -1788,7 +1788,7 @@ LBB13_4:
 	movq	%r8, %r9
 	subq	%rsi, %r9
 	xorl	%eax, %eax
-	movl	$1, %ecx
+	movl	$3, %ecx
 Ltmp218:
 	.p2align	4, 0x90
 LBB13_5:                                ## =>This Inner Loop Header: Depth=1
@@ -1807,17 +1807,17 @@ Ltmp219:
 	##DEBUG_VALUE: c <- $r10d
 	.loc	8 232 9 is_stmt 1       ## ./pl_unreserved_kwlist_d.h:232:9
 	movl	%eax, %edx
-	shll	$5, %edx
-	subl	%eax, %edx
-	.loc	8 232 14 is_stmt 0      ## ./pl_unreserved_kwlist_d.h:232:14
+	shll	$8, %edx
+	addl	%eax, %edx
+	.loc	8 232 15 is_stmt 0      ## ./pl_unreserved_kwlist_d.h:232:15
 	addl	%r10d, %edx
 Ltmp220:
 	##DEBUG_VALUE: UnreservedPLKeywords_hash_func:a <- $edx
 	.loc	8 233 9 is_stmt 1       ## ./pl_unreserved_kwlist_d.h:233:9
 	movl	%ecx, %esi
-	shll	$7, %esi
-	subl	%ecx, %esi
-	.loc	8 233 15 is_stmt 0      ## ./pl_unreserved_kwlist_d.h:233:15
+	shll	$4, %esi
+	addl	%ecx, %esi
+	.loc	8 233 14 is_stmt 0      ## ./pl_unreserved_kwlist_d.h:233:14
 	addl	%r10d, %esi
 	.loc	8 230 21 is_stmt 1      ## ./pl_unreserved_kwlist_d.h:230:21
 	movzbl	1(%rdi), %r10d
@@ -1834,17 +1834,17 @@ Ltmp223:
 	##DEBUG_VALUE: c <- $r10d
 	.loc	8 232 9 is_stmt 1       ## ./pl_unreserved_kwlist_d.h:232:9
 	movl	%edx, %eax
-	shll	$5, %eax
-	subl	%edx, %eax
-	.loc	8 232 14 is_stmt 0      ## ./pl_unreserved_kwlist_d.h:232:14
+	shll	$8, %eax
+	addl	%edx, %eax
+	.loc	8 232 15 is_stmt 0      ## ./pl_unreserved_kwlist_d.h:232:15
 	addl	%r10d, %eax
 Ltmp224:
 	##DEBUG_VALUE: UnreservedPLKeywords_hash_func:a <- $eax
 	.loc	8 233 9 is_stmt 1       ## ./pl_unreserved_kwlist_d.h:233:9
 	movl	%esi, %ecx
-	shll	$7, %ecx
-	subl	%esi, %ecx
-	.loc	8 233 15 is_stmt 0      ## ./pl_unreserved_kwlist_d.h:233:15
+	shll	$4, %ecx
+	addl	%esi, %ecx
+	.loc	8 233 14 is_stmt 0      ## ./pl_unreserved_kwlist_d.h:233:14
 	addl	%r10d, %ecx
 Ltmp225:
 	##DEBUG_VALUE: UnreservedPLKeywords_hash_func:keylen <- [DW_OP_constu 2, DW_OP_minus, DW_OP_stack_value] undef
@@ -1858,11 +1858,11 @@ Ltmp226:
 	##DEBUG_VALUE: UnreservedPLKeywords_hash_func:a <- $eax
 	##DEBUG_VALUE: UnreservedPLKeywords_hash_func:k <- $rdi
 	movl	%eax, %edx
-	shll	$5, %edx
-	subl	%eax, %edx
+	shll	$8, %edx
+	addl	%eax, %edx
 	movl	%ecx, %esi
-	shll	$7, %esi
-	subl	%ecx, %esi
+	shll	$4, %esi
+	addl	%ecx, %esi
 	##DEBUG_VALUE: UnreservedPLKeywords_hash_func:k <- $rdi
 Ltmp227:
 	##DEBUG_VALUE: UnreservedPLKeywords_hash_func:k <- [DW_OP_plus_uconst 1, DW_OP_stack_value] $rdi
@@ -1877,17 +1877,17 @@ LBB13_8:
 	orl	$32, %eax
 Ltmp229:
 	##DEBUG_VALUE: c <- $eax
-	.loc	8 233 15 is_stmt 1      ## ./pl_unreserved_kwlist_d.h:233:15
+	.loc	8 233 14 is_stmt 1      ## ./pl_unreserved_kwlist_d.h:233:14
 	addl	%eax, %esi
 Ltmp230:
 	##DEBUG_VALUE: UnreservedPLKeywords_hash_func:b <- $esi
-	.loc	8 232 14                ## ./pl_unreserved_kwlist_d.h:232:14
+	.loc	8 232 15                ## ./pl_unreserved_kwlist_d.h:232:15
 	addl	%eax, %edx
 Ltmp231:
 	##DEBUG_VALUE: UnreservedPLKeywords_hash_func:a <- $edx
 	movl	%edx, %eax
 Ltmp232:
-	.loc	8 233 15                ## ./pl_unreserved_kwlist_d.h:233:15
+	.loc	8 233 14                ## ./pl_unreserved_kwlist_d.h:233:14
 	movl	%esi, %ecx
 Ltmp233:
 	##DEBUG_VALUE: UnreservedPLKeywords_hash_func:b <- $ecx
@@ -1938,7 +1938,7 @@ Ltmp236:
 	##DEBUG_VALUE: ReservedPLKeywords_hash_func:k <- $rdi
 	xorl	%edx, %edx
 Ltmp237:
-	##DEBUG_VALUE: ReservedPLKeywords_hash_func:b <- 1
+	##DEBUG_VALUE: ReservedPLKeywords_hash_func:b <- 9
 	##DEBUG_VALUE: ReservedPLKeywords_hash_func:a <- 0
 	##DEBUG_VALUE: ReservedPLKeywords_hash_func:k <- $rdi
 	##DEBUG_VALUE: ReservedPLKeywords_hash_func:keylen <- $rsi
@@ -1962,7 +1962,7 @@ Ltmp239:
 	##DEBUG_VALUE: ReservedPLKeywords_hash_func:keylen <- $rsi
 	##DEBUG_VALUE: ReservedPLKeywords_hash_func:key <- $rdi
 	.loc	58 0 15                 ## ./pl_reserved_kwlist_d.h:0:15
-	movl	$127, %esi
+	movl	$153, %esi
 Ltmp240:
                                         ## implicit-def: $eax
                                         ## implicit-def: $ecx
@@ -1978,7 +1978,7 @@ LBB14_1:
 	##DEBUG_VALUE: ReservedPLKeywords_hash_func:keylen <- $rsi
 	##DEBUG_VALUE: ReservedPLKeywords_hash_func:key <- $rdi
 	.loc	58 0 2                  ## ./pl_reserved_kwlist_d.h:0:2
-	movl	$1, %ecx
+	movl	$9, %ecx
 	xorl	%eax, %eax
 	jmp	LBB14_10
 Ltmp242:
@@ -1990,7 +1990,7 @@ LBB14_4:
 	movq	%r8, %r9
 	subq	%rsi, %r9
 	xorl	%eax, %eax
-	movl	$1, %ecx
+	movl	$9, %ecx
 Ltmp243:
 	.p2align	4, 0x90
 LBB14_5:                                ## =>This Inner Loop Header: Depth=1
@@ -2009,17 +2009,17 @@ Ltmp244:
 	##DEBUG_VALUE: c <- $r10d
 	.loc	58 100 9 is_stmt 1      ## ./pl_reserved_kwlist_d.h:100:9
 	movl	%eax, %edx
-	shll	$5, %edx
-	subl	%eax, %edx
-	.loc	58 100 14 is_stmt 0     ## ./pl_reserved_kwlist_d.h:100:14
+	shll	$8, %edx
+	addl	%eax, %edx
+	.loc	58 100 15 is_stmt 0     ## ./pl_reserved_kwlist_d.h:100:15
 	addl	%r10d, %edx
 Ltmp245:
 	##DEBUG_VALUE: ReservedPLKeywords_hash_func:a <- $edx
 	.loc	58 101 9 is_stmt 1      ## ./pl_reserved_kwlist_d.h:101:9
 	movl	%ecx, %esi
-	shll	$7, %esi
-	subl	%ecx, %esi
-	.loc	58 101 15 is_stmt 0     ## ./pl_reserved_kwlist_d.h:101:15
+	shll	$4, %esi
+	addl	%ecx, %esi
+	.loc	58 101 14 is_stmt 0     ## ./pl_reserved_kwlist_d.h:101:14
 	addl	%r10d, %esi
 	.loc	58 98 21 is_stmt 1      ## ./pl_reserved_kwlist_d.h:98:21
 	movzbl	1(%rdi), %r10d
@@ -2036,17 +2036,17 @@ Ltmp248:
 	##DEBUG_VALUE: c <- $r10d
 	.loc	58 100 9 is_stmt 1      ## ./pl_reserved_kwlist_d.h:100:9
 	movl	%edx, %eax
-	shll	$5, %eax
-	subl	%edx, %eax
-	.loc	58 100 14 is_stmt 0     ## ./pl_reserved_kwlist_d.h:100:14
+	shll	$8, %eax
+	addl	%edx, %eax
+	.loc	58 100 15 is_stmt 0     ## ./pl_reserved_kwlist_d.h:100:15
 	addl	%r10d, %eax
 Ltmp249:
 	##DEBUG_VALUE: ReservedPLKeywords_hash_func:a <- $eax
 	.loc	58 101 9 is_stmt 1      ## ./pl_reserved_kwlist_d.h:101:9
 	movl	%esi, %ecx
-	shll	$7, %ecx
-	subl	%esi, %ecx
-	.loc	58 101 15 is_stmt 0     ## ./pl_reserved_kwlist_d.h:101:15
+	shll	$4, %ecx
+	addl	%esi, %ecx
+	.loc	58 101 14 is_stmt 0     ## ./pl_reserved_kwlist_d.h:101:14
 	addl	%r10d, %ecx
 Ltmp250:
 	##DEBUG_VALUE: ReservedPLKeywords_hash_func:keylen <- [DW_OP_constu 2, DW_OP_minus, DW_OP_stack_value] undef
@@ -2060,11 +2060,11 @@ Ltmp251:
 	##DEBUG_VALUE: ReservedPLKeywords_hash_func:a <- $eax
 	##DEBUG_VALUE: ReservedPLKeywords_hash_func:k <- $rdi
 	movl	%eax, %edx
-	shll	$5, %edx
-	subl	%eax, %edx
+	shll	$8, %edx
+	addl	%eax, %edx
 	movl	%ecx, %esi
-	shll	$7, %esi
-	subl	%ecx, %esi
+	shll	$4, %esi
+	addl	%ecx, %esi
 	##DEBUG_VALUE: ReservedPLKeywords_hash_func:k <- $rdi
 Ltmp252:
 	##DEBUG_VALUE: ReservedPLKeywords_hash_func:k <- [DW_OP_plus_uconst 1, DW_OP_stack_value] $rdi
@@ -2079,17 +2079,17 @@ LBB14_8:
 	orl	$32, %eax
 Ltmp254:
 	##DEBUG_VALUE: c <- $eax
-	.loc	58 101 15 is_stmt 1     ## ./pl_reserved_kwlist_d.h:101:15
+	.loc	58 101 14 is_stmt 1     ## ./pl_reserved_kwlist_d.h:101:14
 	addl	%eax, %esi
 Ltmp255:
 	##DEBUG_VALUE: ReservedPLKeywords_hash_func:b <- $esi
-	.loc	58 100 14               ## ./pl_reserved_kwlist_d.h:100:14
+	.loc	58 100 15               ## ./pl_reserved_kwlist_d.h:100:15
 	addl	%eax, %edx
 Ltmp256:
 	##DEBUG_VALUE: ReservedPLKeywords_hash_func:a <- $edx
 	movl	%edx, %eax
 Ltmp257:
-	.loc	58 101 15               ## ./pl_reserved_kwlist_d.h:101:15
+	.loc	58 101 14               ## ./pl_reserved_kwlist_d.h:101:14
 	movl	%esi, %ecx
 Ltmp258:
 	##DEBUG_VALUE: ReservedPLKeywords_hash_func:b <- $ecx
@@ -2780,173 +2780,173 @@ _UnreservedPLKeywords_kw_offsets:
 
 	.p2align	4               ## @UnreservedPLKeywords_hash_func.h
 _UnreservedPLKeywords_hash_func.h:
-	.short	10                      ## 0xa
 	.short	32767                   ## 0x7fff
+	.short	43                      ## 0x2b
 	.short	32767                   ## 0x7fff
-	.short	57                      ## 0x39
+	.short	0                       ## 0x0
+	.short	74                      ## 0x4a
+	.short	40                      ## 0x28
+	.short	7                       ## 0x7
 	.short	32767                   ## 0x7fff
-	.short	62                      ## 0x3e
-	.short	21                      ## 0x15
 	.short	32767                   ## 0x7fff
-	.short	54                      ## 0x36
 	.short	18                      ## 0x12
 	.short	32767                   ## 0x7fff
-	.short	58                      ## 0x3a
-	.short	59                      ## 0x3b
-	.short	65482                   ## 0xffca
-	.short	47                      ## 0x2f
+	.short	14                      ## 0xe
+	.short	42                      ## 0x2a
+	.short	3                       ## 0x3
+	.short	33                      ## 0x21
+	.short	65524                   ## 0xfff4
 	.short	0                       ## 0x0
-	.short	65514                   ## 0xffea
-	.short	65472                   ## 0xffc0
+	.short	35                      ## 0x23
+	.short	0                       ## 0x0
+	.short	65525                   ## 0xfff5
+	.short	16                      ## 0x10
 	.short	32767                   ## 0x7fff
-	.short	65514                   ## 0xffea
-	.short	33                      ## 0x21
-	.short	44                      ## 0x2c
-	.short	65531                   ## 0xfffb
+	.short	21                      ## 0x15
+	.short	0                       ## 0x0
+	.short	39                      ## 0x27
+	.short	65519                   ## 0xffef
 	.short	32767                   ## 0x7fff
+	.short	65515                   ## 0xffeb
+	.short	18                      ## 0x12
+	.short	28                      ## 0x1c
+	.short	0                       ## 0x0
 	.short	32767                   ## 0x7fff
-	.short	43                      ## 0x2b
-	.short	57                      ## 0x39
-	.short	102                     ## 0x66
 	.short	32767                   ## 0x7fff
-	.short	65471                   ## 0xffbf
-	.short	7                       ## 0x7
 	.short	32767                   ## 0x7fff
-	.short	13                      ## 0xd
 	.short	32767                   ## 0x7fff
-	.short	65508                   ## 0xffe4
 	.short	14                      ## 0xe
+	.short	53                      ## 0x35
+	.short	65533                   ## 0xfffd
+	.short	27                      ## 0x1b
 	.short	32767                   ## 0x7fff
 	.short	32767                   ## 0x7fff
-	.short	82                      ## 0x52
+	.short	65527                   ## 0xfff7
+	.short	32767                   ## 0x7fff
+	.short	65503                   ## 0xffdf
 	.short	32767                   ## 0x7fff
+	.short	32767                   ## 0x7fff
+	.short	81                      ## 0x51
 	.short	0                       ## 0x0
 	.short	0                       ## 0x0
 	.short	32767                   ## 0x7fff
-	.short	8                       ## 0x8
-	.short	65493                   ## 0xffd5
-	.short	0                       ## 0x0
-	.short	19                      ## 0x13
-	.short	8                       ## 0x8
-	.short	75                      ## 0x4b
-	.short	65478                   ## 0xffc6
+	.short	7                       ## 0x7
+	.short	63                      ## 0x3f
 	.short	32767                   ## 0x7fff
+	.short	45                      ## 0x2d
 	.short	32767                   ## 0x7fff
 	.short	0                       ## 0x0
-	.short	22                      ## 0x16
-	.short	29                      ## 0x1d
+	.short	49                      ## 0x31
+	.short	83                      ## 0x53
+	.short	65458                   ## 0xffb2
 	.short	32767                   ## 0x7fff
-	.short	65486                   ## 0xffce
-	.short	6                       ## 0x6
 	.short	32767                   ## 0x7fff
-	.short	0                       ## 0x0
-	.short	30                      ## 0x1e
+	.short	34                      ## 0x22
 	.short	32767                   ## 0x7fff
+	.short	65497                   ## 0xffd9
 	.short	32767                   ## 0x7fff
-	.short	29                      ## 0x1d
-	.short	0                       ## 0x0
-	.short	104                     ## 0x68
-	.short	32767                   ## 0x7fff
+	.short	43                      ## 0x2b
+	.short	160                     ## 0xa0
+	.short	45                      ## 0x2d
 	.short	32767                   ## 0x7fff
-	.short	26                      ## 0x1a
 	.short	0                       ## 0x0
+	.short	49                      ## 0x31
+	.short	65513                   ## 0xffe9
 	.short	32767                   ## 0x7fff
 	.short	32767                   ## 0x7fff
-	.short	65527                   ## 0xfff7
-	.short	2                       ## 0x2
+	.short	20                      ## 0x14
+	.short	9                       ## 0x9
+	.short	21                      ## 0x15
+	.short	11                      ## 0xb
+	.short	76                      ## 0x4c
 	.short	32767                   ## 0x7fff
-	.short	50                      ## 0x32
-	.short	39                      ## 0x27
-	.short	38                      ## 0x26
-	.short	39                      ## 0x27
-	.short	80                      ## 0x50
+	.short	53                      ## 0x35
 	.short	32767                   ## 0x7fff
 	.short	32767                   ## 0x7fff
 	.short	32767                   ## 0x7fff
+	.short	8                       ## 0x8
 	.short	32767                   ## 0x7fff
-	.short	65469                   ## 0xffbd
-	.short	89                      ## 0x59
 	.short	32767                   ## 0x7fff
-	.short	65496                   ## 0xffd8
-	.short	64                      ## 0x40
+	.short	0                       ## 0x0
+	.short	35                      ## 0x23
+	.short	11                      ## 0xb
+	.short	65533                   ## 0xfffd
 	.short	32767                   ## 0x7fff
 	.short	32767                   ## 0x7fff
-	.short	26                      ## 0x1a
-	.short	10                      ## 0xa
-	.short	27                      ## 0x1b
+	.short	17                      ## 0x11
+	.short	41                      ## 0x29
+	.short	65495                   ## 0xffd7
+	.short	32767                   ## 0x7fff
+	.short	36                      ## 0x24
 	.short	32767                   ## 0x7fff
 	.short	19                      ## 0x13
 	.short	51                      ## 0x33
-	.short	65523                   ## 0xfff3
-	.short	26                      ## 0x1a
+	.short	65519                   ## 0xffef
+	.short	65495                   ## 0xffd7
 	.short	32767                   ## 0x7fff
 	.short	32767                   ## 0x7fff
 	.short	32767                   ## 0x7fff
-	.short	84                      ## 0x54
-	.short	23                      ## 0x17
-	.short	0                       ## 0x0
-	.short	66                      ## 0x42
-	.short	12                      ## 0xc
-	.short	65531                   ## 0xfffb
 	.short	32767                   ## 0x7fff
 	.short	32767                   ## 0x7fff
-	.short	0                       ## 0x0
 	.short	50                      ## 0x32
-	.short	141                     ## 0x8d
-	.short	72                      ## 0x48
-	.short	45                      ## 0x2d
-	.short	32767                   ## 0x7fff
-	.short	32767                   ## 0x7fff
+	.short	65499                   ## 0xffdb
+	.short	56                      ## 0x38
 	.short	0                       ## 0x0
-	.short	65514                   ## 0xffea
+	.short	2                       ## 0x2
+	.short	65470                   ## 0xffbe
 	.short	0                       ## 0x0
 	.short	32767                   ## 0x7fff
-	.short	32767                   ## 0x7fff
-	.short	65502                   ## 0xffde
 	.short	0                       ## 0x0
-	.short	19                      ## 0x13
-	.short	65531                   ## 0xfffb
+	.short	65513                   ## 0xffe9
 	.short	32767                   ## 0x7fff
 	.short	32767                   ## 0x7fff
 	.short	32767                   ## 0x7fff
-	.short	0                       ## 0x0
-	.short	37                      ## 0x25
-	.short	13                      ## 0xd
-	.short	32767                   ## 0x7fff
-	.short	32767                   ## 0x7fff
+	.short	16                      ## 0x10
 	.short	32767                   ## 0x7fff
+	.short	65526                   ## 0xfff6
 	.short	32767                   ## 0x7fff
-	.short	65468                   ## 0xffbc
-	.short	65532                   ## 0xfffc
 	.short	32767                   ## 0x7fff
-	.short	32767                   ## 0x7fff
-	.short	78                      ## 0x4e
+	.short	0                       ## 0x0
+	.short	0                       ## 0x0
+	.short	7                       ## 0x7
+	.short	0                       ## 0x0
+	.short	71                      ## 0x47
+	.short	0                       ## 0x0
+	.short	65528                   ## 0xfff8
+	.short	71                      ## 0x47
+	.short	65527                   ## 0xfff7
+	.short	46                      ## 0x2e
+	.short	77                      ## 0x4d
+	.short	114                     ## 0x72
+	.short	0                       ## 0x0
+	.short	32                      ## 0x20
+	.short	0                       ## 0x0
+	.short	70                      ## 0x46
+	.short	0                       ## 0x0
+	.short	31                      ## 0x1f
 	.short	32767                   ## 0x7fff
 	.short	32767                   ## 0x7fff
-	.short	0                       ## 0x0
-	.short	85                      ## 0x55
+	.short	50                      ## 0x32
 	.short	32767                   ## 0x7fff
 	.short	32767                   ## 0x7fff
+	.short	62                      ## 0x3e
 	.short	32767                   ## 0x7fff
-	.short	65443                   ## 0xffa3
 	.short	32767                   ## 0x7fff
 	.short	0                       ## 0x0
 	.short	0                       ## 0x0
+	.short	48                      ## 0x30
 	.short	32767                   ## 0x7fff
-	.short	74                      ## 0x4a
-	.short	5                       ## 0x5
+	.short	65518                   ## 0xffee
 	.short	32767                   ## 0x7fff
+	.short	29                      ## 0x1d
 	.short	32767                   ## 0x7fff
-	.short	71                      ## 0x47
 	.short	0                       ## 0x0
 	.short	32767                   ## 0x7fff
-	.short	32767                   ## 0x7fff
+	.short	81                      ## 0x51
+	.short	0                       ## 0x0
 	.short	0                       ## 0x0
 	.short	32767                   ## 0x7fff
-	.short	32767                   ## 0x7fff
-	.short	32767                   ## 0x7fff
-	.short	46                      ## 0x2e
-	.short	70                      ## 0x46
+	.short	20                      ## 0x14
 
 .zerofill __DATA,__bss,_pushback_token,16,4 ## @pushback_token
 .zerofill __DATA,__bss,_pushback_auxdata,160,4 ## @pushback_auxdata
@@ -3000,7 +3000,7 @@ _ReservedPLKeywords_kw_offsets:
 
 	.p2align	4               ## @ReservedPLKeywords_hash_func.h
 _ReservedPLKeywords_hash_func.h:
-	.ascii	"\376\177\007\177\000\177\177\177\022\005\177\033\177\000\177\177\000' \026\n\177\023\346\177\365\000\f\177\177\377\034\024\000\027\177\000\016\370\177\177\177\r\005\177\351\001\000\177"
+	.asciz	"\177\000\017\177\t\177\177\177\362\027\177\000\177\b\371\177\000\177\177\004\005\177\177\026\n\372\177\354\177\376\373\177\001\026\372\016\000\000\177\r\000\377\177\177\025\027\007\f"
 
 	.file	59 "/Users/mark.dilger/review/uninorm.4/src/pl/plpgsql/src" "../../../../src/include/lib/stringinfo.h"
 	.section	__DWARF,__debug_str,regular,debug
@@ -5574,7 +5574,7 @@ Ldebug_loc47:
 .set Lset205, Ltmp218-Lfunc_begin0
 	.quad	Lset205
 	.short	2                       ## Loc expr size
-	.byte	49                      ## DW_OP_lit1
+	.byte	51                      ## DW_OP_lit3
 	.byte	159                     ## DW_OP_stack_value
 .set Lset206, Ltmp218-Lfunc_begin0
 	.quad	Lset206
@@ -5724,7 +5724,7 @@ Ldebug_loc53:
 .set Lset247, Ltmp243-Lfunc_begin0
 	.quad	Lset247
 	.short	2                       ## Loc expr size
-	.byte	49                      ## DW_OP_lit1
+	.byte	57                      ## DW_OP_lit9
 	.byte	159                     ## DW_OP_stack_value
 .set Lset248, Ltmp243-Lfunc_begin0
 	.quad	Lset248
