Some lint cleanup.