Fixing up the last of the original lint issues.