The re-basing was quite messy, with lots of manual conflict resolution, and I must have accidentally blown away a closing brace...  Sorry.