Fixing more bugs with the reachability analysis.