Revise all uses of metadata to see if named metadata should be used

We use normal metadata in several places where named metadata should be used (e.g., you cannot have multiple MOpt instances with a single state). We should revise *everywhere* that we use metadata to see if named metadata should be used instead.