I'm still concerned about getPrevStmt(). It seems like a heavy solution for a problem we know how to solve: we have a PreImplicitCall point and we could use getLocationForCaller() to get the actual location we want. Other than that this looks good. http://llvm-reviews.chandlerc.com/D2441