Work around Xcode beta Optional incompatibility