Fix logging and returning output_rest in ClHelper. TODO: Test this.