More static'ing, and a few fixes resulting from that.