Attempt to treat "metadata" as a collectively singular noun.

Or at least more consistent.

Input from: matteo, ian