partially #5793

So we avoid issues like #10228 in the future resulting from unintentional races.

Attempt to resolve as many of the lint warnings as possible before enabling.