[4.2] A Few CS Fixes

Replaces https://github.com/laravel/framework/pull/5608.