More scope cleanup.