More work on fixing the const problem (clang)