Rework logging infra to make streaming more reliable (seemingly)