better symbols re-write support