Minor code cleanups suggested by NetBSD lint: