[TASK] Remove some < PHP 7 quirks