Statics, cleanup, tests (missed in last commit)