Build #6764346864:   More const. Fix some clippy complaints on branch master over 2 years ago