Switching to the new protocol/optional syntax, away from the old category on NSObject syntax, since this is now recommended by Apple.