Fixes for more rigorous Xcode5 compilation error detection.