Reduce differences with master's Parser.php

Whilst not making 2.5 fully comply with PSR2 (it never wilL), this does reduce the differences with Parser.php.