Keeping up with recent changes in Drupal core.
Issue #2381641 by Xano: Replace drupal_render() calls
Keeping up with recent changes in Drupal core.
Keeping up with recent changes in Drupal core.
Code clean-up.