Turns out the bug I was chasing down was also caused by the introduction of OpenXR code into the package. Very annoying.