Let me remove this line and merge in your commit for `lastDecl` discovery, and then we can worry about 9713 (which your own pull fixes).