Fix lint notices

No more lint errors!

(Looking at the individual commits might be easier.)