syslog-ng-incubator: Refactor