Merge "Work around bugprone-exception-escape bug."