Fixing issues reported by Xcode 5.
Updating to discount v2.1.7 + CLang/LLVM fixes.