Add some more defs and cleanups on World and DBCs