Replace not-bracket variables too