diff --git a/src/aea.f b/src/aea.f
index 33fdcd87..8751491d 100644
--- a/src/aea.f
+++ b/src/aea.f
@@ -56,35 +56,35 @@ SUBROUTINE AEA (IA, IE, NC )
       EQUIVALENCE  (IEBCDC(1),EBCDIC(0))
 C
        DATA  IASCII/
-     & X'000102030009007F',X'0000000B0C0D0E0F',
-     & X'1011120000000000',X'1819000000000000',
-     & X'00001C000A001700',X'0000000000050607',
-     & X'00001600001E0004',X'000000001415001A',
-     & X'2000600000000000',X'0000602E3C282B00',
-     & X'2600000000000000',X'000021242A293B5E',
-     & X'2D2F000000000000',X'00007C2C255F3E3F',
-     & X'0000000000000000',X'00603A2340273D22',
-     & X'2061626364656667',X'6869202020202020',
-     & X'206A6B6C6D6E6F70',X'7172202020202020',
-     & X'207E737475767778',X'797A2020205B2020',
-     & X'0000000000000000',X'00000000005D0000',
-     & X'7B41424344454647',X'4849202020202020',
-     & X'7D4A4B4C4D4E4F50',X'5152202020202020',
-     & X'5C20535455565758',X'595A202020202020',
-     & X'3031323334353637',X'3839202020202020'/
+     & Z'000102030009007F',Z'0000000B0C0D0E0F',
+     & Z'1011120000000000',Z'1819000000000000',
+     & Z'00001C000A001700',Z'0000000000050607',
+     & Z'00001600001E0004',Z'000000001415001A',
+     & Z'2000600000000000',Z'0000602E3C282B00',
+     & Z'2600000000000000',Z'000021242A293B5E',
+     & Z'2D2F000000000000',Z'00007C2C255F3E3F',
+     & Z'0000000000000000',Z'00603A2340273D22',
+     & Z'2061626364656667',Z'6869202020202020',
+     & Z'206A6B6C6D6E6F70',Z'7172202020202020',
+     & Z'207E737475767778',Z'797A2020205B2020',
+     & Z'0000000000000000',Z'00000000005D0000',
+     & Z'7B41424344454647',Z'4849202020202020',
+     & Z'7D4A4B4C4D4E4F50',Z'5152202020202020',
+     & Z'5C20535455565758',Z'595A202020202020',
+     & Z'3031323334353637',Z'3839202020202020'/
 C
 C***  EBCDIC CONTAINS HEX. REPRESENTATION OF EBCDIC CHARACTERS
 C
        DATA  IEBCDC/
-     & X'00010203372D2E2F',X'1605250B0C0D0E0F',
-     & X'101112003C3D3226',X'18193F2722003500',
-     & X'405A7F7B5B6C507D',X'4D5D5C4E6B604B61',
-     & X'F0F1F2F3F4F5F6F7',X'F8F97A5E4C7E6E6F',
-     & X'7CC1C2C3C4C5C6C7',X'C8C9D1D2D3D4D5D6',
-     & X'D7D8D9E2E3E4E5E6',X'E7E8E9ADE0BD5F6D',
-     & X'7981828384858687',X'8889919293949596',
-     & X'979899A2A3A4A5A6',X'A7A8A9C06AD0A107',
-     & 16*X'4040404040404040'/
+     & Z'00010203372D2E2F',Z'1605250B0C0D0E0F',
+     & Z'101112003C3D3226',Z'18193F2722003500',
+     & Z'405A7F7B5B6C507D',Z'4D5D5C4E6B604B61',
+     & Z'F0F1F2F3F4F5F6F7',Z'F8F97A5E4C7E6E6F',
+     & Z'7CC1C2C3C4C5C6C7',Z'C8C9D1D2D3D4D5D6',
+     & Z'D7D8D9E2E3E4E5E6',Z'E7E8E9ADE0BD5F6D',
+     & Z'7981828384858687',Z'8889919293949596',
+     & Z'979899A2A3A4A5A6',Z'A7A8A9C06AD0A107',
+     & 16*Z'4040404040404040'/
 C
       NUM = IABS(NC)
 C
diff --git a/src/w3ai00.f b/src/w3ai00.f
index da51953a..41ee8190 100644
--- a/src/w3ai00.f
+++ b/src/w3ai00.f
@@ -92,9 +92,9 @@ SUBROUTINE W3AI00(REAL8,PACK,LABEL)
 C
        EQUIVALENCE    (B,IB)
 C
-       DATA  MASK16/X'000000000000FFFF'/
-       DATA  MASK32/X'00000000FFFFFFFF'/
-       DATA  MASKN /X'0000FFFF00000000'/
+       DATA  MASK16/Z'000000000000FFFF'/
+       DATA  MASK32/Z'00000000FFFFFFFF'/
+       DATA  MASKN /Z'0000FFFF00000000'/
 C
 C TRANSFER LABEL DATA TO WORDS 1-4.  GET WORD COUNT, COMPUTE BYTES.
 C
diff --git a/src/w3ai01.f b/src/w3ai01.f
index 3e3e12da..babc9032 100644
--- a/src/w3ai01.f
+++ b/src/w3ai01.f
@@ -66,8 +66,8 @@ SUBROUTINE W3AI01(PACK,REAL8,LABEL)
 C
        SAVE
 C
-       DATA  MASK16/X'000000000000FFFF'/
-       DATA  MASK32/X'00000000FFFFFFFF'/
+       DATA  MASK16/Z'000000000000FFFF'/
+       DATA  MASK32/Z'00000000FFFFFFFF'/
 C
 C      MOVE OFFICE NOTE 84 12 32 BIT ID'S INTO LABEL
 C
diff --git a/src/w3ai15.f b/src/w3ai15.f
index e570f8a4..350ce298 100644
--- a/src/w3ai15.f
+++ b/src/w3ai15.f
@@ -78,16 +78,16 @@ SUBROUTINE  W3AI15 (NBUFA,NBUFB,N1,N2,MINUS)
       DATA  IDIV  /1,10,100,1000,10000,100000,1000000,10000000/
       DATA  NUM   /'0','1','2','3','4','5','6','7','8','9'/
 C     FOR LITTLE_ENDIAN
-      DATA  ZERO  /X'2020202020202030',X'2020202020203030',
-     &             X'2020202020303030',X'2020202030303030',
-     &             X'2020203030303030',X'2020303030303030',
-     &             X'2030303030303030',X'3030303030303030'/
+      DATA  ZERO  /Z'2020202020202030',Z'2020202020203030',
+     &             Z'2020202020303030',Z'2020202030303030',
+     &             Z'2020203030303030',Z'2020303030303030',
+     &             Z'2030303030303030',Z'3030303030303030'/
 
 C     FOR BIG_ENDIAN
-c     DATA  ZERO  /X'3020202020202020',X'3030202020202020',
-c    &             X'3030302020202020',X'3030303020202020',
-c    &             X'3030303030202020',X'3030303030302020',
-c    &             X'3030303030303020',X'3030303030303030'/
+c     DATA  ZERO  /Z'3020202020202020',Z'3030202020202020',
+c    &             Z'3030302020202020',Z'3030303020202020',
+c    &             Z'3030303030202020',Z'3030303030302020',
+c    &             Z'3030303030303020',Z'3030303030303030'/
 C
       DO 100 I = 1,N1
         IF (NBUFA(I).EQ.0) THEN
diff --git a/src/w3ai38.f b/src/w3ai38.f
index 62d78c88..19c9eec9 100644
--- a/src/w3ai38.f
+++ b/src/w3ai38.f
@@ -54,22 +54,22 @@ SUBROUTINE W3AI38 (IE, NC )
 C***   ASCII  CONTAINS ASCII CHARACTERS, AS PUNCHED ON IBM029
 C
        DATA  IASCII/
-     & X'000102030009007F',X'0000000B0C0D0E0F',
-     & X'1011120000000000',X'1819000000000000',
-     & X'00001C000A001700',X'0000000000050607',
-     & X'00001600001E0004',X'000000001415001A',
-     & X'2000600000000000',X'0000602E3C282B00',
-     & X'2600000000000000',X'000021242A293B5E',
-     & X'2D2F000000000000',X'00007C2C255F3E3F',
-     & X'0000000000000000',X'00603A2340273D22',
-     & X'2061626364656667',X'6869202020202020',
-     & X'206A6B6C6D6E6F70',X'7172202020202020',
-     & X'207E737475767778',X'797A2020205B2020',
-     & X'0000000000000000',X'00000000005D0000',
-     & X'7B41424344454647',X'4849202020202020',
-     & X'7D4A4B4C4D4E4F50',X'5152202020202020',
-     & X'5C20535455565758',X'595A202020202020',
-     & X'3031323334353637',X'3839202020202020'/
+     & Z'000102030009007F',Z'0000000B0C0D0E0F',
+     & Z'1011120000000000',Z'1819000000000000',
+     & Z'00001C000A001700',Z'0000000000050607',
+     & Z'00001600001E0004',Z'000000001415001A',
+     & Z'2000600000000000',Z'0000602E3C282B00',
+     & Z'2600000000000000',Z'000021242A293B5E',
+     & Z'2D2F000000000000',Z'00007C2C255F3E3F',
+     & Z'0000000000000000',Z'00603A2340273D22',
+     & Z'2061626364656667',Z'6869202020202020',
+     & Z'206A6B6C6D6E6F70',Z'7172202020202020',
+     & Z'207E737475767778',Z'797A2020205B2020',
+     & Z'0000000000000000',Z'00000000005D0000',
+     & Z'7B41424344454647',Z'4849202020202020',
+     & Z'7D4A4B4C4D4E4F50',Z'5152202020202020',
+     & Z'5C20535455565758',Z'595A202020202020',
+     & Z'3031323334353637',Z'3839202020202020'/
 C
       IF (NC .LE. 0)   RETURN
 C
diff --git a/src/w3ai39.f b/src/w3ai39.f
index 17895cd5..e71b3baa 100644
--- a/src/w3ai39.f
+++ b/src/w3ai39.f
@@ -58,15 +58,15 @@ SUBROUTINE W3AI39 (NFLD, N)
 C      THIS TABLE IS THE SAME AS HDS ASSEMBLER VERSION
 C
        DATA  IEBCDC/
-     & X'007D006C000000E0',X'00657C66004C0000',
-     & X'0000000000000000',X'0000000000005B00',
-     & X'40D07F7B5000506E',X'4D5D5C4F6B604B61',
-     & X'F0F1F2F3F4F5F6F7',X'F8F90000007E00C0',
-     & X'64C1C2C3C4C5C6C7',X'C8C9D1D2D3D4D5D6',
-     & X'D7D8D9E2E3E4E5E6',X'E7E8E90062636D00',
-     & X'0000000000000000',X'0000000000000000',
-     & X'0000000000000000',X'000000000000005F',
-     & 16 * X'0000000000000000'/
+     & Z'007D006C000000E0',Z'00657C66004C0000',
+     & Z'0000000000000000',Z'0000000000005B00',
+     & Z'40D07F7B5000506E',Z'4D5D5C4F6B604B61',
+     & Z'F0F1F2F3F4F5F6F7',Z'F8F90000007E00C0',
+     & Z'64C1C2C3C4C5C6C7',Z'C8C9D1D2D3D4D5D6',
+     & Z'D7D8D9E2E3E4E5E6',Z'E7E8E90062636D00',
+     & Z'0000000000000000',Z'0000000000000000',
+     & Z'0000000000000000',Z'000000000000005F',
+     & 16 * Z'0000000000000000'/
 C
       IF (N .LE. 0)   RETURN
 C
diff --git a/src/w3fi32.f b/src/w3fi32.f
index f4d7eaaf..767e3378 100644
--- a/src/w3fi32.f
+++ b/src/w3fi32.f
@@ -60,23 +60,23 @@ SUBROUTINE W3FI32(LARRAY,KIDNT)
 C
        SAVE
 C
-       DATA  ITABLE/X'0000000000340C01',X'0000000000280C01',
-     &              X'0000000000200801',X'00000000001C0401',
-     &              X'0000000001081401',X'0000000001000801',
-     &              X'00000000003C0402',X'0000000000340802',
-     &              X'0000000000280C02',X'0000000000200802',
-     &              X'00000000001C0402',X'0000000001081402',
-     &              X'0000000001000802',X'0000000000380803',
-     &              X'0000000000300803',X'0000000000280803',
-     &              X'0000000000200803',X'00000000001C0403',
-     &              X'0000000000100C03',X'0000000000001003',
-     &              X'0000000000380804',X'0000000000300804',
-     &              X'0000000000280804',X'0000000000200804',
-     &              X'0000000000180804',X'0000000000100804',
-     &              X'0000000000001004'/
-       DATA  KX    /X'00000000FFFFFFFF'/
-       DATA  MASK  /X'00000000000000FF'/
-       DATA  MASK16/X'FFFFFFFFFFFF0000'/
+       DATA  ITABLE/Z'0000000000340C01',Z'0000000000280C01',
+     &              Z'0000000000200801',Z'00000000001C0401',
+     &              Z'0000000001081401',Z'0000000001000801',
+     &              Z'00000000003C0402',Z'0000000000340802',
+     &              Z'0000000000280C02',Z'0000000000200802',
+     &              Z'00000000001C0402',Z'0000000001081402',
+     &              Z'0000000001000802',Z'0000000000380803',
+     &              Z'0000000000300803',Z'0000000000280803',
+     &              Z'0000000000200803',Z'00000000001C0403',
+     &              Z'0000000000100C03',Z'0000000000001003',
+     &              Z'0000000000380804',Z'0000000000300804',
+     &              Z'0000000000280804',Z'0000000000200804',
+     &              Z'0000000000180804',Z'0000000000100804',
+     &              Z'0000000000001004'/
+       DATA  KX    /Z'00000000FFFFFFFF'/
+       DATA  MASK  /Z'00000000000000FF'/
+       DATA  MASK16/Z'FFFFFFFFFFFF0000'/
 C
 C     MAKE KIDNT = 0
 C
diff --git a/src/w3fp06.f b/src/w3fp06.f
index c043226e..8047726b 100644
--- a/src/w3fp06.f
+++ b/src/w3fp06.f
@@ -54,14 +54,14 @@ SUBROUTINE W3FP06(ID,KTITLE,N)
 C
       CHARACTER * 324  KTITLE
 C
-      DATA  MASK(1)/X'0000000F'/
-      DATA  MASK(2)/X'000000FF'/
-      DATA  MASK(3)/X'00000FFF'/
-      DATA  MASK(4)/X'0000FFFF'/
-      DATA  MASK(5)/X'000FFFFF'/
-      DATA  MASK(6)/X'00FFFFFF'/
-      DATA  MASK(7)/X'0FFFFFFF'/
-      DATA  MASK(8)/X'FFFFFFFF'/
+      DATA  MASK(1)/Z'0000000F'/
+      DATA  MASK(2)/Z'000000FF'/
+      DATA  MASK(3)/Z'00000FFF'/
+      DATA  MASK(4)/Z'0000FFFF'/
+      DATA  MASK(5)/Z'000FFFFF'/
+      DATA  MASK(6)/Z'00FFFFFF'/
+      DATA  MASK(7)/Z'0FFFFFFF'/
+      DATA  MASK(8)/Z'FFFFFFFF'/
 C
       CALL LINE01(ID,MASK,KTITLE)
         IF (N.GT.1) GO TO 10
@@ -153,23 +153,23 @@ SUBROUTINE LINE01(ID,MASK,KTITLE)
 C
 C     IDWORDS:  MASK CONTROL (INTEGER)
 C
-      DATA SHFMSK( 1)/X'20020100'/
-      DATA SHFMSK( 2)/X'28020400'/
-      DATA SHFMSK( 3)/X'30020400'/
-      DATA SHFMSK( 4)/X'38020400'/
-      DATA SHFMSK( 5)/X'08050100'/
-      DATA SHFMSK( 6)/X'00020100'/
-      DATA SHFMSK( 7)/X'08050200'/
-      DATA SHFMSK( 8)/X'00020200'/
-      DATA SHFMSK( 9)/X'3C010200'/
-      DATA SHFMSK(10)/X'28030100'/
-      DATA SHFMSK(11)/X'28030200'/
-      DATA SHFMSK(12)/X'34030100'/
-      DATA SHFMSK(13)/X'20020400'/
-      DATA SHFMSK(14)/X'30020400'/
-      DATA SHFMSK(15)/X'1C010100'/
-      DATA SHFMSK(16)/X'1C010200'/
-      DATA SHFMSK(17)/X'20020200'/
+      DATA SHFMSK( 1)/Z'20020100'/
+      DATA SHFMSK( 2)/Z'28020400'/
+      DATA SHFMSK( 3)/Z'30020400'/
+      DATA SHFMSK( 4)/Z'38020400'/
+      DATA SHFMSK( 5)/Z'08050100'/
+      DATA SHFMSK( 6)/Z'00020100'/
+      DATA SHFMSK( 7)/Z'08050200'/
+      DATA SHFMSK( 8)/Z'00020200'/
+      DATA SHFMSK( 9)/Z'3C010200'/
+      DATA SHFMSK(10)/Z'28030100'/
+      DATA SHFMSK(11)/Z'28030200'/
+      DATA SHFMSK(12)/Z'34030100'/
+      DATA SHFMSK(13)/Z'20020400'/
+      DATA SHFMSK(14)/Z'30020400'/
+      DATA SHFMSK(15)/Z'1C010100'/
+      DATA SHFMSK(16)/Z'1C010200'/
+      DATA SHFMSK(17)/Z'20020200'/
 C
 C     REFERENCE TABLE FOR SNAME.
 C
@@ -906,25 +906,25 @@ SUBROUTINE LINE02(ID,MASK,KTITLE)
 C
 C     IDWORDS:  MASK CONTROL (INTEGER)
 C
-      DATA MASKN /X'FFFFFFFFFFFF0000'/
-      DATA MASK32/X'00000000FFFFFFFF'/
-      DATA SHFMSK( 1)/X'3C010200'/
-      DATA SHFMSK( 2)/X'1C010100'/
-      DATA SHFMSK( 3)/X'1C010200'/
-      DATA SHFMSK( 4)/X'20020100'/
-      DATA SHFMSK( 5)/X'20020200'/
-      DATA SHFMSK( 6)/X'38020300'/
-      DATA SHFMSK( 7)/X'30020300'/
-      DATA SHFMSK( 8)/X'28020300'/
-      DATA SHFMSK( 9)/X'20020300'/
-      DATA SHFMSK(10)/X'3C010300'/
-      DATA SHFMSK(11)/X'18020400'/
-      DATA SHFMSK(12)/X'10020400'/
-      DATA SHFMSK(13)/X'00040400'/
-      DATA SHFMSK(14)/X'30040500'/
-      DATA SHFMSK(15)/X'00040500'/
-      DATA SHFMSK(16)/X'00080500'/
-      DATA SHFMSK(17)/X'20040600'/
+      DATA MASKN /Z'FFFFFFFFFFFF0000'/
+      DATA MASK32/Z'00000000FFFFFFFF'/
+      DATA SHFMSK( 1)/Z'3C010200'/
+      DATA SHFMSK( 2)/Z'1C010100'/
+      DATA SHFMSK( 3)/Z'1C010200'/
+      DATA SHFMSK( 4)/Z'20020100'/
+      DATA SHFMSK( 5)/Z'20020200'/
+      DATA SHFMSK( 6)/Z'38020300'/
+      DATA SHFMSK( 7)/Z'30020300'/
+      DATA SHFMSK( 8)/Z'28020300'/
+      DATA SHFMSK( 9)/Z'20020300'/
+      DATA SHFMSK(10)/Z'3C010300'/
+      DATA SHFMSK(11)/Z'18020400'/
+      DATA SHFMSK(12)/Z'10020400'/
+      DATA SHFMSK(13)/Z'00040400'/
+      DATA SHFMSK(14)/Z'30040500'/
+      DATA SHFMSK(15)/Z'00040500'/
+      DATA SHFMSK(16)/Z'00080500'/
+      DATA SHFMSK(17)/Z'20040600'/
 C
  100  FORMAT(' M=',I2,' T=',I2,' N=',I2,' F1=',I3,' F2=',I3,' CD=',I3,
      1' CM=',I3,' KS=',I3,' K=',I3,' GES=',I2,' R=',I3,' G=',I3,
@@ -1007,7 +1007,7 @@ SUBROUTINE LINE03(ID,KTITLE)
 C
       CHARACTER * 324  KTITLE
 C
-      DATA  MASK32/X'00000000FFFFFFFF'/
+      DATA  MASK32/Z'00000000FFFFFFFF'/
 C
 C     FORTRAN INTERNAL WRITE STATEMENT REPLACES ENCODE
 C