Thank you, this does work. Unfortunately this makes the resulting code look like a non-sequitur, so I'm not sure I could justify it for the general case.