Adapt to other WoltLab/WCF merges too