Fix dragonegg compilation after recent debug info changes.  Fix a test case that
broke due to other debug info patches changing the metadata output.  Note that
the fix is not perfect as I have some testcases that get assertion failures, but
hopefully it will bring some bots back to life.