Variable scope cleanup.