Various fixes for PHP_CodeSniffer 2.x compatibility