Cleaning things up a little bit for Sonar.