Issue #18594:  Make the C code more closely match the pure python code.
#19166: use an unused var in a test.  Patch by Vajrasky Kok.