[WIP] Adjustments to fit refactored TYPO3CR

see https://review.typo3.org/#/c/21249