Working in optional braces and semis