Spread some more const and remove variables named new to be able to
compile this under C++.