Fix part of #5261: InefficientWeight #10671

Job	Run time
Compute affected tests	1m 34s
Run Bazel Test (app-shard0;H4sIAAAAAAAAAKWUwU4jMQyGD9z2yIv4Pgek0nYBAVLZVrvS7gFMYjqGTBw5aem8/SbTlj...	15m 25s
Run Bazel Test (app-shard1;H4sIAAAAAAAAAJWTsXLbMAyGh24d8yLYtSlV3OYaO77a12u7wSQqo6FEHggx9duXos5nu0...	16m 9s
Run Bazel Test (app-shard2;H4sIAAAAAAAAAJ3STW/CMAwG4MNuO/JHfO+NsQ8mAaoomibt5DUmZEvjyDFM/PulgQn1BN...	14m 20s
Run Bazel Test (app-shard3;H4sIAAAAAAAAAKWUTU/DMAyGD9w48kd8322IDRBMVGxjaAIhLzGdUZZETrqPf0+SMk09IC...	15m 0s
Run Bazel Test (generic-shard4;H4sIAAAAAAAAALWQvWpDMQyFx0LGvIj2rGkpgf4RAh2LsBWj1FdyLbktefr4emhK6X...	9m 36s
Run Bazel Test (app-shard5;H4sIAAAAAAAAAK2TwW7bMAyGD73t2BfhPbemrdcAaZsuGTbsUrASa3NTJIWinWVPP9lJkP...	14m 36s
Run Bazel Test (app-shard6;H4sIAAAAAAAAAK2UQU+DQBCFD9489o/M3VuDGhtti1pNTEzMyE5hFXYmu2O1/96Btionpf...	16m 19s
Run Bazel Test (app-shard7;H4sIAAAAAAAAAKWTT2/UMBDFD9w49ov4ntu2qNJK2aV/UoqEQJraU2cg8Zixk5Jvj+10gV...	14m 56s
Run Bazel Test (app-shard8;H4sIAAAAAAAAAJ2UwW7bMAyGD7vtmBfhPbegRoAATZMlXTugO4y1GIebLKqU4iBvX0lxkB...	14m 58s
Run Bazel Test (app-shard9;H4sIAAAAAAAAAK2UT0/DMAzFD9w47ovkvtu0wYS0jbIVhICL15jOkMaRExX67Um6P1CkaR...	14m 38s
Run Bazel Test (app-shard10;H4sIAAAAAAAAAK2UTW/DIAyGD7vtuD/ie27tvlQp1bRmWrWvgxushJUCArdd//2ANo2iT...	11m 3s
Run Bazel Test (app-shard11;H4sIAAAAAAAAAKWTT1PCMBDFD948+kVy59YRkJGq/CnowctOupR1SjZuQh2/vUkKQg8Od...	8m 59s
Check Bazel Test Results	1s
	2h 47m 34s

Provide feedback