Issue #456: Remove rogue calls to drupal_* functions in core.
Merge pull request #588 from quicksketch/456/update_drupal_calls

Issue #456: Remove rogue calls to drupal_* functions in core.