More reduce declaration scope

No function change.