debuginfo: Clean the debuginfo module up a bit.