Beginning to convert definition loading areas of codebase to adhoc mode now that tracefile doesn't consider them.