Revert "Remove stray curly braces"; some of them had effects

This reverts commit f075f5c72d842f8c9f14fc3139aabb79a10162e6.