diff --git a/sys/sys/kernel.h b/sys/sys/kernel.h
index 9eff1b61dc9a..6a5b5e56e8ea 100644
--- a/sys/sys/kernel.h
+++ b/sys/sys/kernel.h
@@ -228,13 +228,13 @@ struct sysinit {
 		subsystem,					\
 		order,						\
 		func,						\
-		ident						\
+		(ident)						\
 	};							\
 	DATA_SET(sysinit_set,uniquifier ## _sys_init);
 
 #define	SYSINIT(uniquifier, subsystem, order, func, ident)	\
 	C_SYSINIT(uniquifier, subsystem, order,			\
-	(sysinit_cfunc_t)(sysinit_nfunc_t)func, (void *)ident)
+	(sysinit_cfunc_t)(sysinit_nfunc_t)func, (void *)(ident))
 
 /*
  * Called on module unload: no special processing
@@ -244,13 +244,13 @@ struct sysinit {
 		subsystem,					\
 		order,						\
 		func,						\
-		ident						\
+		(ident)						\
 	};							\
 	DATA_SET(sysuninit_set,uniquifier ## _sys_uninit)
 
 #define	SYSUNINIT(uniquifier, subsystem, order, func, ident)	\
 	C_SYSUNINIT(uniquifier, subsystem, order,		\
-	(sysinit_cfunc_t)(sysinit_nfunc_t)func, (void *)ident)
+	(sysinit_cfunc_t)(sysinit_nfunc_t)func, (void *)(ident))
 
 void	sysinit_add(struct sysinit **set, struct sysinit **set_end);
 
diff --git a/sys/sys/lock.h b/sys/sys/lock.h
index a55bf544580d..8ecdcb8780f0 100644
--- a/sys/sys/lock.h
+++ b/sys/sys/lock.h
@@ -246,8 +246,8 @@ void	witness_assert(struct lock_object *, int, const char *, int);
 	witness_restore((lock), __CONCAT(n, __wf), __CONCAT(n, __wl))
 
 #else	/* WITNESS */
-#define	WITNESS_INIT(lock)	(lock)->lo_flags |= LO_INITIALIZED
-#define	WITNESS_DESTROY(lock)	(lock)->lo_flags &= ~LO_INITIALIZED
+#define	WITNESS_INIT(lock)	((lock)->lo_flags |= LO_INITIALIZED)
+#define	WITNESS_DESTROY(lock)	((lock)->lo_flags &= ~LO_INITIALIZED)
 #define	WITNESS_LOCK(lock, flags, file, line)
 #define	WITNESS_UPGRADE(lock, flags, file, line)
 #define	WITNESS_DOWNGRADE(lock, flags, file, line)