Changes as a result of recent Apple recommendations surrounding support for 64 bit and modern Objective-C syntax. Also some cleanup of unused imports in implementation files.