Keeping up with recent changs in Drupal core.