Adventures in upgrading from Drupal v5.x to Drupal 6.x