r5660: Reduce number of generated "{}"'s