Fix some breakage in the compiler with my selection of iOS changes by OS.