Minor changes after resolution of http://forge.typo3.org/issues/35790 and http://forge.typo3.org/issues/44235