Reduce Psalm baseline

This is a moving target. I don't want to pursue a certain threshold (no baseline would be best though). But as long as it doesn't draw too much time, I'd like to invest in improving static analyzability of the project.