[TASK] Improve CGL nitpicks

Change-Id: I9d122eaf2d2a65764aa0d966d03c115c2bb0c08d
Reviewed-on: https://review.typo3.org/28066
Reviewed-by: Georg Ringer
Tested-by: Georg Ringer