Some lint cleanup. More to do later.