More coverage cleanup.