Updating _gen_var_decls, _gen_parse_arg_types, _gen_parse_arg_list, _gen_numpy_array_index_macro, _gen_numpy_array_macros, _gen_return_val, to use self and Property self.TypeDict + self.IndexTypeDict and Unique Query to a dict: self.QueryValueTypeDict