Insert matching brace in more cases

1 job for wip/overwrite-braces in 22 minutes and 51 seconds (queued for 32 minutes and 42 seconds)