More improvements to brace handling, removal of extra set of braces for function-style calls of include and require