Remove static: Small step towards #20

I made a bunch of small commits to ease code review, feel free to [rebaseandsqua.sh](http://rebaseandsqua.sh) as appropriate.