Fixes compilation with libimobiledevice. Small cleanups for consistency. Signed-off-by: Rosen Penev <rosenp@gmail.com>