(c-beginning-of-decl-1): Better way to handle protection labels, one which doesn't get confused by inherit colons. (c-end-of-decl-1): Don't treat functions that have "class" or "struct" in the return type as classes or structs.