Closure lint improvements