cpp: fixed comma affecting paren-nesting
cpp: fixed finishing-comma in macro argument