Updated recent changes to meet drupal coding standards.