[#3028] More lint fixes.