Fix my fix (r5539) to the `multi-changesettings-crash' fix. Ahem.