Since lapwing no longer runs with -Werror, and might be gone completely
soon, we no longer need the various workarounds gathered over time to
avoid compiler warnings there. The attached patch reverts various
patches and makes similar adjustments to some newer code.
