Make non-static functions, that may be static, static