Code review feedback, including enforcing RAII
Merge commit 'c277184' into fake_logger