Fix clang_delta compilation on Clang 3.4svn.

I made some hasty changes to get the project to compile with Clang 3.4svn (r188867). I'm not completely confident that these are all the correct changes, so please review closely.