Resolve Xcode 8.3 warnings.

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