Small cleanups and increased logging to diagnose SERVER-15082