Get rid of the remaining where/let when moving the last decl out of
local declarations.