Several cleanups to increase portability

These fixes will enhance portability for platforms with stricter compiler settings (such as OpenBSD).

They should not break Linux compatibility.