Making src/ compliant with PSR-2

I think it's worth settling on this early.

Most code was already PSR-2 or close enough, this just firms it up.