Some logging cleanup for #393