A bit of lint cleanup.