Some more minor fixes to make the code build without warning on NetBSD/pmax 5.0 with GNU C++.
Authored by: debug 2009-07-11
Parent: [r5478]
Child: [r5480]
