Fixing up some non-static methods that should be static.