diff -r cd3954499086 -r 95b6bcadd6c4 src/main.c
--- a/src/main.c	Mon Jun 30 13:28:59 2008 -0400
+++ b/src/main.c	Tue Jul 01 09:22:25 2008 +0100
@@ -61,7 +61,9 @@
 		iter = razor_package_iterator_create(set);
 		pattern = argv[i];
 		count = 0;
-		while (razor_package_iterator_next(iter, &package, RAZOR_DETAIL_NAME, &name, NULL)) {
+		while (razor_package_iterator_next(iter, &package,
+						   RAZOR_DETAIL_NAME, &name,
+						   RAZOR_DETAIL_LAST)) {
 			if (fnmatch(pattern, name, 0) != 0)
 				continue;
 
@@ -89,7 +91,8 @@
 	while (razor_package_iterator_next(iter, &package,
 					   RAZOR_DETAIL_NAME, &name,
 					   RAZOR_DETAIL_VERSION, &version,
-					   RAZOR_DETAIL_ARCH, &arch, NULL)) {
+					   RAZOR_DETAIL_ARCH, &arch,
+					   RAZOR_DETAIL_LAST)) {
 		if (flags & LIST_PACKAGES_ONLY_NAMES)
 			printf("%s\n", name);
 		else
@@ -167,7 +170,10 @@
 	set = razor_set_open(repo_filename);
 	pi = create_iterator_from_argv(set, argc, argv);
 	while (razor_package_iterator_next(pi, &package,
-					   &name, &version, &arch))
+					   RAZOR_DETAIL_NAME, &name,
+					   RAZOR_DETAIL_VERSION, &version,
+					   RAZOR_DETAIL_ARCH, &arch,
+					   RAZOR_DETAIL_LAST))
 		list_package_properties(set, package, type);
 	razor_package_iterator_destroy(pi);
 	razor_set_destroy(set);
@@ -253,7 +259,10 @@
 
 	pi = create_iterator_from_argv(set, argc, argv);
 	while (razor_package_iterator_next(pi, &package,
-					   &name, &version, &arch))
+					   RAZOR_DETAIL_NAME, &name,
+					   RAZOR_DETAIL_VERSION, &version,
+					   RAZOR_DETAIL_ARCH, &arch,
+					   RAZOR_DETAIL_LAST))
 		razor_set_list_package_files(set, package);
 	razor_package_iterator_destroy(pi);
 
@@ -445,7 +454,8 @@
 
 	pi = razor_package_iterator_create(set);
 	while (razor_package_iterator_next(pi, &package,
-					   RAZOR_DETAIL_NAME, &name, NULL)) {
+					   RAZOR_DETAIL_NAME, &name,
+					   RAZOR_DETAIL_LAST)) {
 		if (pattern && fnmatch(pattern, name, 0) == 0) {
 			razor_transaction_update_package(trans, package);
 			matches++;
@@ -466,7 +476,9 @@
 	int matches = 0;
 
 	pi = razor_package_iterator_create(set);
-	while (razor_package_iterator_next(pi, &package, RAZOR_DETAIL_NAME, &name, NULL)) {
+	while (razor_package_iterator_next(pi, &package,
+					   RAZOR_DETAIL_NAME, &name,
+					   RAZOR_DETAIL_LAST)) {
 		if (pattern && fnmatch(pattern, name, 0) == 0) {
 			razor_transaction_remove_package(trans, package);
 			matches++;
@@ -676,7 +688,8 @@
 	while (razor_package_iterator_next(pi, &package,
 					   RAZOR_DETAIL_NAME, &name,
 					   RAZOR_DETAIL_VERSION, &version,
-					   RAZOR_DETAIL_ARCH, &arch, NULL)) {
+					   RAZOR_DETAIL_ARCH, &arch,
+					   RAZOR_DETAIL_LAST)) {
 		snprintf(url, sizeof url,
 			 "%s/Packages/%s",
 			 yum_url, rpm_filename(name, version, arch));
@@ -708,7 +721,8 @@
 	while (razor_package_iterator_next(pi, &package,
 					   RAZOR_DETAIL_NAME, &name,
 					   RAZOR_DETAIL_VERSION, &version,
-					   RAZOR_DETAIL_ARCH, &arch, NULL)) {
+					   RAZOR_DETAIL_ARCH, &arch,
+					   RAZOR_DETAIL_LAST)) {
 		printf("install %s-%s\n", name, version);
 
 		snprintf(file, sizeof file,
@@ -816,7 +830,8 @@
 	while (razor_package_iterator_next(pi, &package,
 					   RAZOR_DETAIL_NAME, &name,
 					   RAZOR_DETAIL_VERSION, &version,
-					   RAZOR_DETAIL_ARCH, &arch, NULL)) {
+					   RAZOR_DETAIL_ARCH, &arch,
+					   RAZOR_DETAIL_LAST)) {
 		if (pattern && fnmatch(pattern, name, 0) != 0)
 			continue;
 
@@ -859,7 +874,8 @@
 	while (razor_package_iterator_next(pi, &package,
 					   RAZOR_DETAIL_NAME, &name,
 					   RAZOR_DETAIL_VERSION, &version,
-					   RAZOR_DETAIL_ARCH, &arch, NULL)) {
+					   RAZOR_DETAIL_ARCH, &arch,
+					   RAZOR_DETAIL_LAST)) {
 		if (pattern && fnmatch(pattern, name, 0) != 0)
 			continue;
 
@@ -868,7 +884,7 @@
 					   RAZOR_DETAIL_DESCRIPTION, &description,
 					   RAZOR_DETAIL_URL, &url,
 					   RAZOR_DETAIL_LICENSE, &license,
-					   NULL);
+					   RAZOR_DETAIL_LAST);
 
 		printf ("Name:        %s\n", name);
 		printf ("Arch:        %s\n", arch);
@@ -920,7 +936,7 @@
 					   RAZOR_DETAIL_DESCRIPTION, &description,
 					   RAZOR_DETAIL_URL, &url,
 					   RAZOR_DETAIL_LICENSE, &license,
-					   NULL)) {
+					   RAZOR_DETAIL_LAST)) {
 		if (!fnmatch(pattern, name, FNM_CASEFOLD) ||
 		    !fnmatch(pattern, url, FNM_CASEFOLD) ||
 		    !fnmatch(pattern, summary, FNM_CASEFOLD) ||