I will try to make this API a bit less error prone, but for now just get another test passing. llvm-svn: 315645