Fix lint notices

Only 7 lint errors left after this one!

(Looking at the individual commits might be easier.)