LGTM, I've made similar mistakes like 10 times – looks like these variables are not convenient to use... The outtake is: try the patch before committing :) http://reviews.llvm.org/D5493