Simplify, rename, refactor Ident parsing