Make more functions static.