Made the braces stuff a config option so that we can tweak it in prod, and made several more candidates pass tests!