More fixes for clang 3.4
Is should now build with clang 3.4 on NetBSD current 6.99.36.