The same branch that this change is on, I also have a change to build a separate .pdmp file for the macOS app bundle - but that set of changes isn't yet correct. It still picks up the wrong file name, still.
However, good news: One part of the bug is dead, at least (: