Make two functions static and eliminate an unused #define.