Optimizations to drupal integration.