Refactoring AbstractStorage/StackableStorage to avoid PHPCPD errors