PSR2-ify lots of stuff