Add a regression test for #17697, minor cleanup
#17697 (closed) was fixed somewhere between 9.0 and master, this adds a regression test.
Also minor cleanup: remove some unused names, simplify FFI code.
#17697 (closed) was fixed somewhere between 9.0 and master, this adds a regression test.
Also minor cleanup: remove some unused names, simplify FFI code.