Yes, that's all just as it was, and in places braces were not required / interchangeable so this is more of an optional compiler choice than a real change