Switch to more Apple-style curly braces, sigh