Merge "Fix comma in $(if ...)."