Reduces lint errors from 121 to 52 (-57%). Line count from 1916 to 1671 (-13%). Another step in resolving issue #2902.
The note is not visible to the blocked user.