Refactored to improve file naming semantics - after eliminating dead code, the only thing left in OCAExtensions were the debugging macros, so I eliminated the .m and changed the .h to OCADebug.h