Remove unnecssary "as" clauses from exceptions
Remove unnecssary "as" clauses from exceptions

Also changing some of the "as" clauses to use "exc" rather than "e", for
consistency.

saltstack/salt,saltstack/salt,saltstack/salt,saltstack/salt,saltstack/salt