Remove some INC_SAVE_POINTER that should be buggy