Argh - now it both passes lint AND builds properly.