Resolve Xcode 8.3 warnings.

Authored by featherless on Thu, Mar 16, 3:17 PM.