Updates for Drupal WxT support.