Changes to suppress debug output, now driven from command options