Err, in fact, this turned out to be a combination of D329 with what is described here. Should I try to convince arc to make a separate patch for only described functionality change? http://llvm-reviews.chandlerc.com/D330