More PSR-2, mostly inline control structures and tabs to spaces