Fix build error caused by r201186 (GCC's "declaration of X changes meaning of Y").