Revert previous.
Fix build under NetBSD/amd64 6.99.32 and GCC 4.5.4.