Updates for compatibility with Drupal WxT.