Also, two functions that were needlessly public are now static. Signed-off-by: Alessandro Rubini <rubini@gnudd.com>