Add static to some functions that should have it.