start code cleanup

src/Plugin/Derivative/FieldBlock.php

@@ -24,7 +24,7 @@ class FieldBlock extends DeriverBase {
    * {@inheritdoc}
    */
   public function getDerivativeDefinitions($base_plugin_definition) {
-    $blocks = FieldBlockHelper::fieldBlockGetBlockList();
+    $blocks = $this->fieldBlockGetBlockList();
 
     foreach ($blocks as $fieldblock_id => $description) {
       $this->derivatives[$fieldblock_id] = $base_plugin_definition;
@@ -39,7 +39,8 @@ class FieldBlock extends DeriverBase {
    *
    * @return array An array of fieldblocks.
    */
-  public static function fieldBlockGetBlockList() {
+  protected function fieldBlockGetBlockList() {
+    // @todo Check if we actually need static caching.
     $fieldblocks = &drupal_static(__FUNCTION__);
 
     if (!isset($fieldblocks)) {