Sonar cleanups.