This should no longer be necessary once you make the module-debug change I described.