output_collector: moved stuff into namespace