[#3028] Lint "fixes"