Some coverage cleanup.