Make some private functions static (thanks `make smelly`)