Remove $ hack in parse_ident
Add support for arrays and hashes