Thanks for the investigation and patch. I found a few other things wrong with `isFunctionDeclaratorRequiringReturnTypeDeduction`; I checked this in as r203733, along with fixes for the other issues here. http://llvm-reviews.chandlerc.com/D3062