More analysis cleanup.