Merge "Include command-line arguments in comment."