- Cleaned up code.
- Added (local) forward declarations for (private) C functions (even though Xcode no longer complains).