Distribute, remove static methods more sensibly.