(c-beginning-of-statement-1): When checking for bare semi, don't match on a semi following a close brace. (c-guess-basic-syntax): CASE 5I: When adding 'inclass syntax, use the relpos pointing to the class opening brace, unless that hangs on the right side, in which case, use the start of the class/struct keyword.