A clean version of the static analysis cleanup.