Cleanup to improve coverage.