remove ident-kind from, tighten up Identifier