Tidy up some lint issues.