(Apple) More style nit cleanups