Index: contrib/byacc/closure.c
===================================================================
--- contrib/byacc/closure.c
+++ contrib/byacc/closure.c
@@ -87,7 +87,7 @@
 		k = 0;
 	    }
 
-	    if (cword & (unsigned)(1 << k))
+	    if (cword & (1u << k))
 	    {
 		rp = derives[j];
 		while ((rule = *rp++) >= 0)
Index: contrib/byacc/warshall.c
===================================================================
--- contrib/byacc/warshall.c
+++ contrib/byacc/warshall.c
@@ -28,7 +28,7 @@
 
 	while (rowj < relend)
 	{
-	    if (*ccol & (unsigned)(1 << i))
+	    if (*ccol & (1u << i))
 	    {
 		rp = rowi;
 		rend = rowj + rowsize;