Aleksei Kaveshnikov

Thanks, I've added your suggested changes with v2.3.1 (ed3039f)

gcc-7.3? No such error with 7.4 or 8.2. At this point can't really tell how to deal with this.