Improve upgrade script to handle list comprehensions as arguments. (#7229)

python's ast module does not return the correct location, so we
have to do our best to scan backwards to find where the [ token
that trully started the list comprehension occurs.