Remove some superfluous return types in the metadata code (#17519)

Type inference can already correctly infer those return types, no need
to explicit anymore.