parse_dict() improvements