CS FIxes

                   
|Q            |A  |
|---          |---|
|Bug Fix?     |n  |
|New Feature? |n  |
|BC Breaks?   |n  |
|Deprecations?|n  |
|Tests Pass?  |Y  |
|Fixed Tickets|   |
|License      |MIT|
|Doc PR       |   |
                   

Based on https://scrutinizer-ci.com/g/gushphp/gush/inspections/501009b6-383e-4e5a-9617-04e729bdf62b/patches