I ended up reverting this file back to the original version.  I felt it would easier just to bury the logic that maps the Cocoa ID's to these ID's in the implementation file instead of tearing up this header.

Hopefully that's alright.