rsmith added a comment. I think maybe you missed my comment from before: "Please add a member to `Decl`, something like `isLexicallyWithinFunctionOrMethod`, and use it in both places rather than duplicating the local class / local function declaration check." http://reviews.llvm.org/D11194