Cleaned up and retyped some handlers to be static.