Change a few methods to static methods.  No functionality change.