Merge "Fix misc-macro-parentheses warnings in cts."