Remove ALL optional-braces this time.