Do we need to remove all these braces? I'd say this is more of a taste thing and I'd rather not start changing taste things, especially if they're unrelated to the actual change.