Added unwrap calls around ident regex matches