I thinks we ought to bite the bullet and lower SWITCH_EXPRs already. All these headaches seem unnecessary and the insertion code is kind of brittle. Diego.