Better handling whether Drupal is cli

See the related issue for details about the complexity of determining whether Drupal is CLI.