Replace more static return types