Issue #2365469: Make more code coverage explicit.