Merge "Fix misc-macro-parentheses warnings in init and other core modules."