More migration to static methods.