Fix so that macro/relace only walks once.