Fix braces for matches at start or end of s unit