A few tweaks for Drupal field-group changes.