Let Xcode fix two warnings, but two remaining.