Revert "Stripping curlies."

This reverts commit 64743a3acaca82bfb583115188e999c18efa26f2.
Revert "Stripping curlies."

This reverts commit dd1bed2f4cff320b291f685a789f86839f749f5a.
Revert "Stripping out curlies."

This reverts commit 6bc1212d1e94abb9c9c18ba1c6afd55776bf033f.