(Apple) Style nits/cleanups