Attached is a combined patch with an updated commit message.

I cannot reproduce those test failures. I see 167/167 tests pass when I run
`make -C test check-lisp-use-package'. I'm testing commit be4819b, plus the
attached patch, on macOS 15.4.1.