Implements PSR2 fixes.