Fix return types on static methods.