Replace remove_const with stub_const