MERGE: Fix bug exposed by conc052.