Merge "Fix belated review comments on syslog change."