[bugfix] Make compile again with g++ 4.4

g++ 4.4 needs more remove_consts

Fixes FS 1358