Fixes for phpcs-1.5.0.