remove some code redundancy
disable broken optimisation for except-as special case