Merge "DeferredStringifier: Clean up comments and indentation in tests"