Improved differentiation between Objective C and C++ debugging library variants; removed redundant references to files.