Another batches of PSR2 fixes