diff -urp ubercart.original/docs/hooks.php ubercart/docs/hooks.php
--- ubercart.original/docs/hooks.php	2009-09-24 01:45:55.000000000 +1000
+++ ubercart/docs/hooks.php	2009-09-26 07:04:37.000000000 +1000
@@ -257,7 +257,7 @@ function hook_cart_display($item) {
  *   No return value for load.
  *   TRUE or FALSE for can_ship.
  */
-function hook_cart_item($op, &$item) {
+function hook_cart_item($op, $item) {
   switch ($op) {
     case 'load':
       $term = array_shift(taxonomy_node_get_terms_by_vocabulary($item->nid, variable_get('uc_manufacturer_vid', 0)));
@@ -809,9 +809,9 @@ function hook_order_pane() {
  *   Nothing should be returned. Hook implementations should receive the
  *     $product object by reference and alter it directly.
  */
-function hook_order_product_alter(&$product, $order) {
-  drupal_set_message('hook_order_product_alter(&$product, $order):');
-  drupal_set_message('&$product: <pre>'. print_r($product, TRUE) .'</pre>');
+function hook_order_product_alter($product, $order) {
+  drupal_set_message('hook_order_product_alter($product, $order):');
+  drupal_set_message('$product: <pre>'. print_r($product, TRUE) .'</pre>');
   drupal_set_message('$order: <pre>'. print_r($order, TRUE) .'</pre>');
 }
 
diff -urp ubercart.original/payment/uc_credit/uc_credit.module ubercart/payment/uc_credit/uc_credit.module
--- ubercart.original/payment/uc_credit/uc_credit.module	2009-09-22 00:34:49.000000000 +1000
+++ ubercart/payment/uc_credit/uc_credit.module	2009-09-25 15:49:58.000000000 +1000
@@ -281,7 +281,7 @@ function uc_credit_store_status() {
 /**
  * Implementation of hook_order().
  */
-function uc_credit_order($op, &$arg1, $arg2) {
+function uc_credit_order($op, $arg1, $arg2) {
   // Set up the encryption key and object for saving and loading.
   if ($arg1->payment_method == 'credit' && ($op == 'save' || $op == 'load')) {
     // Log an error if encryption isn't configured properly.
diff -urp ubercart.original/payment/uc_google_checkout/uc_google_checkout.module ubercart/payment/uc_google_checkout/uc_google_checkout.module
--- ubercart.original/payment/uc_google_checkout/uc_google_checkout.module	2009-09-22 00:34:48.000000000 +1000
+++ ubercart/payment/uc_google_checkout/uc_google_checkout.module	2009-09-26 07:08:40.000000000 +1000
@@ -231,7 +231,7 @@ function uc_google_checkout_line_item() 
   return $items;
 }
 
-function uc_google_checkout_order($op, &$arg1, $arg2) {
+function uc_google_checkout_order($op, $arg1, $arg2) {
   switch ($op) {
     case 'load':
       $result = db_query("SELECT * FROM {uc_gc_orders} WHERE order_id = %d", $arg1->order_id);
diff -urp ubercart.original/payment/uc_payment/uc_payment.module ubercart/payment/uc_payment/uc_payment.module
--- ubercart.original/payment/uc_payment/uc_payment.module	2009-09-22 00:34:46.000000000 +1000
+++ ubercart/payment/uc_payment/uc_payment.module	2009-09-25 15:50:52.000000000 +1000
@@ -231,7 +231,7 @@ function uc_payment_form_alter(&$form, &
 /**
  * Implementation of hook_order().
  */
-function uc_payment_order($op, &$arg1) {
+function uc_payment_order($op, $arg1) {
   switch ($op) {
     case 'submit':
       $func = _payment_method_data($arg1->payment_method, 'callback');
diff -urp ubercart.original/shipping/uc_quote/uc_quote.module ubercart/shipping/uc_quote/uc_quote.module
--- ubercart.original/shipping/uc_quote/uc_quote.module	2009-09-22 00:34:47.000000000 +1000
+++ ubercart/shipping/uc_quote/uc_quote.module	2009-09-25 15:51:22.000000000 +1000
@@ -509,7 +509,7 @@ function uc_quote_update_cart_item() {
 /**
  * Implementation of hook_order().
  */
-function uc_quote_order($op, &$arg1, $arg2) {
+function uc_quote_order($op, $arg1, $arg2) {
   switch ($op) {
     case 'submit':
       unset($_SESSION['quote']);
diff -urp ubercart.original/uc_attribute/uc_attribute.admin.inc ubercart/uc_attribute/uc_attribute.admin.inc
--- ubercart.original/uc_attribute/uc_attribute.admin.inc	2009-09-24 05:50:45.000000000 +1000
+++ ubercart/uc_attribute/uc_attribute.admin.inc	2009-09-26 06:57:03.000000000 +1000
@@ -933,7 +933,7 @@ function theme_uc_object_options_form($f
  *     #options - Array of option names
  * @return Themed set of attribute options.
  */
-function theme_uc_product_attributes(&$element) {
+function theme_uc_product_attributes($element) {
   $option_rows = array();
 
   foreach (element_children($element) as $key) {
diff -urp ubercart.original/uc_attribute/uc_attribute.module ubercart/uc_attribute/uc_attribute.module
--- ubercart.original/uc_attribute/uc_attribute.module	2009-09-22 00:34:50.000000000 +1000
+++ ubercart/uc_attribute/uc_attribute.module	2009-09-26 07:04:56.000000000 +1000
@@ -420,7 +420,7 @@ function uc_attribute_add_to_cart_data($
 /**
  * Implemenation of hook_order_product_alter().
  */
-function uc_attribute_order_product_alter(&$product, $order) {
+function uc_attribute_order_product_alter($product, $order) {
   // Convert the attribute and option ids to their current names. This
   // preserves the important data in case the attributes or options are
   // changed later.
@@ -449,7 +449,7 @@ function uc_attribute_product_class($typ
 /**
  * Implementation of hook_cart_item().
  */
-function uc_attribute_cart_item($op, &$item) {
+function uc_attribute_cart_item($op, $item) {
   switch ($op) {
     case 'load':
       $options = _uc_cart_product_get_options($item);
diff -urp ubercart.original/uc_file/uc_file.module ubercart/uc_file/uc_file.module
--- ubercart.original/uc_file/uc_file.module	2009-09-22 00:34:48.000000000 +1000
+++ ubercart/uc_file/uc_file.module	2009-09-26 07:01:20.000000000 +1000
@@ -594,7 +594,7 @@ function uc_file_add_to_cart($nid, $qty,
 /**
  * Implementation of hook_cart_item().
  */
-function uc_file_cart_item($op, &$item) {
+function uc_file_cart_item($op, $item) {
 
   switch ($op) {
 
diff -urp ubercart.original/uc_googleanalytics/uc_googleanalytics.module ubercart/uc_googleanalytics/uc_googleanalytics.module
--- ubercart.original/uc_googleanalytics/uc_googleanalytics.module	2009-07-22 00:37:20.000000000 +1000
+++ ubercart/uc_googleanalytics/uc_googleanalytics.module	2009-09-26 07:07:50.000000000 +1000
@@ -46,7 +46,7 @@ function uc_googleanalytics_footer($main
 /**
  * Implementation of hook_order().
  */
-function uc_googleanalytics_order($op, &$arg1, $arg2) {
+function uc_googleanalytics_order($op, $arg1, $arg2) {
   // If a new order is created during the checkout process...
   if ($op == 'new' && arg(0) == 'cart') {
     // Store the order ID for later use.
diff -urp ubercart.original/uc_product/uc_product.module ubercart/uc_product/uc_product.module
--- ubercart.original/uc_product/uc_product.module	2009-09-24 05:50:45.000000000 +1000
+++ ubercart/uc_product/uc_product.module	2009-09-25 15:20:55.000000000 +1000
@@ -1005,7 +1005,7 @@ function uc_product_content_extra_fields
  * Reset a content type's default image field setting when that field instance
  * is removed.
  */
-function uc_product_content_fieldapi($op, &$field) {
+function uc_product_content_fieldapi($op, $field) {
   switch ($op) {
     case 'delete instance':
       if ($field->field_name == variable_get('uc_image_'. $field->type_name, NULL)) {
diff -urp ubercart.original/uc_product_kit/uc_product_kit.module ubercart/uc_product_kit/uc_product_kit.module
--- ubercart.original/uc_product_kit/uc_product_kit.module	2009-09-24 01:45:57.000000000 +1000
+++ ubercart/uc_product_kit/uc_product_kit.module	2009-09-26 07:05:23.000000000 +1000
@@ -911,7 +911,7 @@ function uc_product_kit_add_to_cart($nid
 /**
  * Implementation of hook_cart_item().
  */
-function uc_product_kit_cart_item($op, &$item) {
+function uc_product_kit_cart_item($op, $item) {
   switch ($op) {
     case 'load':
       if (isset($item->data['kit_id']) && ($kit = node_load($item->data['kit_id'])) && $kit->mutable != UC_PRODUCT_KIT_MUTABLE) {
@@ -934,7 +934,7 @@ function uc_product_kit_cart_item($op, &
  * @param $order
  *   The order being edited.
  */
-function uc_product_kit_order_product_alter(&$product, $order) {
+function uc_product_kit_order_product_alter($product, $order) {
   if ($product->type !== 'product_kit') {
     return;
   }
diff -urp ubercart.original/uc_roles/uc_roles.module ubercart/uc_roles/uc_roles.module
--- ubercart.original/uc_roles/uc_roles.module	2009-09-22 00:34:49.000000000 +1000
+++ ubercart/uc_roles/uc_roles.module	2009-09-26 07:03:14.000000000 +1000
@@ -500,7 +500,7 @@ function uc_roles_user($op, &$edit, &$ac
 /**
  * Implementation of hook_cart_item().
  */
-function uc_roles_cart_item($op, &$item) {
+function uc_roles_cart_item($op, $item) {
   switch ($op) {
     case 'can_ship':
       $roles = db_query("SELECT * FROM {uc_roles_products} WHERE nid = %d", $item->nid);