Fixed remaining PSR-2 coding violations.