More satisfying Drupal coding standards