Some more changes related to the new except syntax and semantics,

by Collin Winter.