Introduce some consistency when to use OFObject* and when to use id.