Issue #2365469: Code coverage fixes.
Issue #2365469: More code coverage fixes.