Merge "Fix misc-macro-parentheses warnings in Tracks.cpp."