On the surface changes look OK to me, but obviously wait for someone else to review. One thing about the test: AFAIK we've moved away from the convention of adding the dates to the names of tests. http://reviews.llvm.org/D4252