Regarding commit 5d10ae6f51ecbd9bbe29fd8d0f2694ce12b38f17, isn't that redundancy? Isn't it enough and normal convention to *either* use "static" for file-local functions, *or* put them (and file-local classes, etc) into an unnamed (anonymous) namespace? --tml