Make various internal functions static.